Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
authored by
Heiko Carstens
and committed by
Jason A. Donenfeld
013e9843
26d49596
+2
-6
+1
-5
arch/s390/include/asm/alternative.h
+1
-5
arch/s390/include/asm/alternative.h
···
39
39
#define ALT_TYPE_SHIFT 20
40
40
#define ALT_CTX_SHIFT 28
41
41
42
-
#define ALT_FACILITY_EARLY(facility) (ALT_CTX_EARLY << ALT_CTX_SHIFT | \
43
-
ALT_TYPE_FACILITY << ALT_TYPE_SHIFT | \
44
-
(facility) << ALT_DATA_SHIFT)
45
-
46
-
#define ALT_FACILITY(facility) (ALT_CTX_LATE << ALT_CTX_SHIFT | \
42
+
#define ALT_FACILITY(facility) (ALT_CTX_EARLY << ALT_CTX_SHIFT | \
47
43
ALT_TYPE_FACILITY << ALT_TYPE_SHIFT | \
48
44
(facility) << ALT_DATA_SHIFT)
49
45
+1
-1
arch/s390/kernel/entry.S
+1
-1
arch/s390/kernel/entry.S
···
42
42
43
43
.macro LPSWEY address, lpswe
44
44
ALTERNATIVE_2 "b \lpswe;nopr", \
45
-
".insn siy,0xeb0000000071,\address,0", ALT_FACILITY_EARLY(193), \
45
+
".insn siy,0xeb0000000071,\address,0", ALT_FACILITY(193), \
46
46
__stringify(.insn siy,0xeb0000000071,LOWCORE_ALT_ADDRESS+\address,0), \
47
47
ALT_LOWCORE
48
48
.endm