Commit cd59f1d8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents b8c8c141 c3a589fd

arch/s390/boot/startup.c

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ static int cmma_test_essa(void) 
		: [reg1] "=&d" (reg1),

		  [reg2] "=&a" (reg2),

		  [rc] "+&d" (rc),

		  [tmp] "=&d" (tmp),

		  [tmp] "+&d" (tmp),

		  "+Q" (get_lowcore()->program_new_psw),

		  "=Q" (old)

		: [psw_old] "a" (&old),

arch/s390/configs/debug_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -469,6 +469,7 @@ CONFIG_SCSI_DH_ALUA=m 
CONFIG_MD=y

CONFIG_BLK_DEV_MD=y

# CONFIG_MD_BITMAP_FILE is not set

CONFIG_MD_LINEAR=m

CONFIG_MD_CLUSTER=m

CONFIG_BCACHE=m

CONFIG_BLK_DEV_DM=y
@@ -874,6 +875,7 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=300 
CONFIG_LATENCYTOP=y

CONFIG_BOOTTIME_TRACING=y

CONFIG_FUNCTION_GRAPH_RETVAL=y

CONFIG_FUNCTION_GRAPH_RETADDR=y

CONFIG_FPROBE=y

CONFIG_FUNCTION_PROFILER=y

CONFIG_STACK_TRACER=y

arch/s390/configs/defconfig

+2 −0
Original line number Diff line number Diff line
@@ -459,6 +459,7 @@ CONFIG_SCSI_DH_ALUA=m 
CONFIG_MD=y

CONFIG_BLK_DEV_MD=y

# CONFIG_MD_BITMAP_FILE is not set

CONFIG_MD_LINEAR=m

CONFIG_MD_CLUSTER=m

CONFIG_BCACHE=m

CONFIG_BLK_DEV_DM=y
@@ -825,6 +826,7 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60 
CONFIG_LATENCYTOP=y

CONFIG_BOOTTIME_TRACING=y

CONFIG_FUNCTION_GRAPH_RETVAL=y

CONFIG_FUNCTION_GRAPH_RETADDR=y

CONFIG_FPROBE=y

CONFIG_FUNCTION_PROFILER=y

CONFIG_STACK_TRACER=y

arch/s390/purgatory/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ PURGATORY_OBJS = $(addprefix $(obj)/,$(purgatory-y)) 
$(obj)/sha256.o: $(srctree)/lib/crypto/sha256.c FORCE

	$(call if_changed_rule,cc_o_c)



CFLAGS_sha256.o := -D__DISABLE_EXPORTS -D__NO_FORTIFY

CFLAGS_sha256.o := -D__NO_FORTIFY



$(obj)/mem.o: $(srctree)/arch/s390/lib/mem.S FORCE

	$(call if_changed_rule,as_o_S)
@@ -19,9 +19,11 @@ KBUILD_CFLAGS += -fno-zero-initialized-in-bss -fno-builtin -ffreestanding 
KBUILD_CFLAGS += -Os -m64 -msoft-float -fno-common

KBUILD_CFLAGS += -fno-stack-protector

KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING

KBUILD_CFLAGS += -D__DISABLE_EXPORTS

KBUILD_CFLAGS += $(CLANG_FLAGS)

KBUILD_CFLAGS += $(call cc-option,-fno-PIE)

KBUILD_AFLAGS := $(filter-out -DCC_USING_EXPOLINE,$(KBUILD_AFLAGS))

KBUILD_AFLAGS += -D__DISABLE_EXPORTS



# Since we link purgatory with -r unresolved symbols are not checked, so we

# also link a purgatory.chk binary without -r to check for unresolved symbols.