Skip to content

Commit cd59f1d

Browse files
committed
Merge tag 's390-6.14-5' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Vasily Gorbik: - Fix inline asm constraint in cmma_test_essa() to avoid potential ESSA detection miscompilation - Fix build failure with CONFIG_GENDWARFKSYMS by disabling purgatory symbol exports with -D__DISABLE_EXPORTS - Update defconfigs * tag 's390-6.14-5' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: s390/boot: Fix ESSA detection s390/purgatory: Use -D__DISABLE_EXPORTS s390: Update defconfigs
2 parents b8c8c14 + c3a589f commit cd59f1d

File tree

4 files changed

+8
-2
lines changed

4 files changed

+8
-2
lines changed

arch/s390/boot/startup.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ static int cmma_test_essa(void)
8686
: [reg1] "=&d" (reg1),
8787
[reg2] "=&a" (reg2),
8888
[rc] "+&d" (rc),
89-
[tmp] "=&d" (tmp),
89+
[tmp] "+&d" (tmp),
9090
"+Q" (get_lowcore()->program_new_psw),
9191
"=Q" (old)
9292
: [psw_old] "a" (&old),

arch/s390/configs/debug_defconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -469,6 +469,7 @@ CONFIG_SCSI_DH_ALUA=m
469469
CONFIG_MD=y
470470
CONFIG_BLK_DEV_MD=y
471471
# CONFIG_MD_BITMAP_FILE is not set
472+
CONFIG_MD_LINEAR=m
472473
CONFIG_MD_CLUSTER=m
473474
CONFIG_BCACHE=m
474475
CONFIG_BLK_DEV_DM=y
@@ -874,6 +875,7 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=300
874875
CONFIG_LATENCYTOP=y
875876
CONFIG_BOOTTIME_TRACING=y
876877
CONFIG_FUNCTION_GRAPH_RETVAL=y
878+
CONFIG_FUNCTION_GRAPH_RETADDR=y
877879
CONFIG_FPROBE=y
878880
CONFIG_FUNCTION_PROFILER=y
879881
CONFIG_STACK_TRACER=y

arch/s390/configs/defconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -459,6 +459,7 @@ CONFIG_SCSI_DH_ALUA=m
459459
CONFIG_MD=y
460460
CONFIG_BLK_DEV_MD=y
461461
# CONFIG_MD_BITMAP_FILE is not set
462+
CONFIG_MD_LINEAR=m
462463
CONFIG_MD_CLUSTER=m
463464
CONFIG_BCACHE=m
464465
CONFIG_BLK_DEV_DM=y
@@ -825,6 +826,7 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60
825826
CONFIG_LATENCYTOP=y
826827
CONFIG_BOOTTIME_TRACING=y
827828
CONFIG_FUNCTION_GRAPH_RETVAL=y
829+
CONFIG_FUNCTION_GRAPH_RETADDR=y
828830
CONFIG_FPROBE=y
829831
CONFIG_FUNCTION_PROFILER=y
830832
CONFIG_STACK_TRACER=y

arch/s390/purgatory/Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ PURGATORY_OBJS = $(addprefix $(obj)/,$(purgatory-y))
88
$(obj)/sha256.o: $(srctree)/lib/crypto/sha256.c FORCE
99
$(call if_changed_rule,cc_o_c)
1010

11-
CFLAGS_sha256.o := -D__DISABLE_EXPORTS -D__NO_FORTIFY
11+
CFLAGS_sha256.o := -D__NO_FORTIFY
1212

1313
$(obj)/mem.o: $(srctree)/arch/s390/lib/mem.S FORCE
1414
$(call if_changed_rule,as_o_S)
@@ -19,9 +19,11 @@ KBUILD_CFLAGS += -fno-zero-initialized-in-bss -fno-builtin -ffreestanding
1919
KBUILD_CFLAGS += -Os -m64 -msoft-float -fno-common
2020
KBUILD_CFLAGS += -fno-stack-protector
2121
KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING
22+
KBUILD_CFLAGS += -D__DISABLE_EXPORTS
2223
KBUILD_CFLAGS += $(CLANG_FLAGS)
2324
KBUILD_CFLAGS += $(call cc-option,-fno-PIE)
2425
KBUILD_AFLAGS := $(filter-out -DCC_USING_EXPOLINE,$(KBUILD_AFLAGS))
26+
KBUILD_AFLAGS += -D__DISABLE_EXPORTS
2527

2628
# Since we link purgatory with -r unresolved symbols are not checked, so we
2729
# also link a purgatory.chk binary without -r to check for unresolved symbols.

0 commit comments

Comments
 (0)