s390/alternatives: Remove ALT_FACILITY_EARLY

Patch all alternatives which depend on facilities from the decompressor.
There is no technical reason which enforces to split patching of such
alternatives to the decompressor and the kernel.

This simplifies alternative handling a bit, since one alternative type is
removed.

Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

diff --git a/arch/s390/include/asm/alternative.h b/arch/s390/include/asm/alternative.h
index de980c938a3e148f15044fff9cd4e943ccad1bb1..73e781b56bfe893688ef71b92f785361e43e2d03 100644 (file)
--- a/arch/s390/include/asm/alternative.h
+++ b/arch/s390/include/asm/alternative.h
@@ -39,11 +39,7 @@
 #define ALT_TYPE_SHIFT         20
 #define ALT_CTX_SHIFT          28
 
-#define ALT_FACILITY_EARLY(facility)   (ALT_CTX_EARLY << ALT_CTX_SHIFT         | \
-                                        ALT_TYPE_FACILITY << ALT_TYPE_SHIFT    | \
-                                        (facility) << ALT_DATA_SHIFT)
-
-#define ALT_FACILITY(facility)         (ALT_CTX_LATE << ALT_CTX_SHIFT          | \
+#define ALT_FACILITY(facility)         (ALT_CTX_EARLY << ALT_CTX_SHIFT         | \
                                         ALT_TYPE_FACILITY << ALT_TYPE_SHIFT    | \
                                         (facility) << ALT_DATA_SHIFT)
 

diff --git a/arch/s390/kernel/entry.S b/arch/s390/kernel/entry.S
index 749410cfdbc078d5ee5c53de946e6ae29a502959..269436665d029761d757ce99c470942c6eb38ef7 100644 (file)
--- a/arch/s390/kernel/entry.S
+++ b/arch/s390/kernel/entry.S
@@ -42,7 +42,7 @@ _LPP_OFFSET   = __LC_LPP
 
        .macro LPSWEY address, lpswe
        ALTERNATIVE_2 "b \lpswe;nopr", \
-               ".insn siy,0xeb0000000071,\address,0", ALT_FACILITY_EARLY(193),         \
+               ".insn siy,0xeb0000000071,\address,0", ALT_FACILITY(193),               \
                __stringify(.insn siy,0xeb0000000071,LOWCORE_ALT_ADDRESS+\address,0),   \
                ALT_LOWCORE
        .endm