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

Merge tag 's390-6.1-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull s390 fixes from Alexander Gordeev:

 - fix memcpy warning about field-spanning write in zcrypt driver

 - minor updates to defconfigs

 - remove CONFIG_DEBUG_INFO_BTF from all defconfigs and add btf.config
   addon config file. It significantly decreases compile time and allows
   quickly enabling that option into the current kernel config

 - add kasan.config addon config file which allows to easily enable
   KASAN into the current kernel config

 - binutils commit 906f69cf65da ("IBM zSystems: Issue error for *DBL
   relocs on misaligned symbols") caused several link errors. Always
   build relocatable kernel to avoid this problem

 - raise the minimum clang version to 15.0.0 to avoid silent generation
   of a corrupted code

* tag 's390-6.1-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  scripts/min-tool-version.sh: raise minimum clang version to 15.0.0 for s390
  s390: always build relocatable kernel
  s390/configs: add kasan.config addon config file
  s390/configs: move CONFIG_DEBUG_INFO_BTF into btf.config addon config
  s390: update defconfigs
  s390/zcrypt: fix warning about field-spanning write
parents df65494f 30d17fac

arch/s390/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -568,8 +568,7 @@ config EXPOLINE_FULL 
endchoice



config RELOCATABLE

	bool "Build a relocatable kernel"

	default y

	def_bool y

	help

	  This builds a kernel image that retains relocation information

	  so it can be loaded at an arbitrary address.
@@ -578,10 +577,11 @@ config RELOCATABLE 
	  bootup process.

	  The relocations make the kernel image about 15% larger (compressed

	  10%), but are discarded at runtime.

	  Note: this option exists only for documentation purposes, please do

	  not remove it.



config RANDOMIZE_BASE

	bool "Randomize the address of the kernel image (KASLR)"

	depends on RELOCATABLE

	default y

	help

	  In support of Kernel Address Space Layout Randomization (KASLR),

arch/s390/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -14,10 +14,8 @@ KBUILD_AFLAGS_MODULE += -fPIC 
KBUILD_CFLAGS_MODULE += -fPIC

KBUILD_AFLAGS	+= -m64

KBUILD_CFLAGS	+= -m64

ifeq ($(CONFIG_RELOCATABLE),y)

KBUILD_CFLAGS	+= -fPIE

LDFLAGS_vmlinux	:= -pie

endif

aflags_dwarf	:= -Wa,-gdwarf-2

KBUILD_AFLAGS_DECOMPRESSOR := $(CLANG_FLAGS) -m64 -D__ASSEMBLY__

ifndef CONFIG_AS_IS_LLVM

arch/s390/boot/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -37,9 +37,8 @@ CFLAGS_sclp_early_core.o += -I$(srctree)/drivers/s390/char 


obj-y	:= head.o als.o startup.o mem_detect.o ipl_parm.o ipl_report.o

obj-y	+= string.o ebcdic.o sclp_early_core.o mem.o ipl_vmparm.o cmdline.o

obj-y	+= version.o pgm_check_info.o ctype.o ipl_data.o

obj-y	+= version.o pgm_check_info.o ctype.o ipl_data.o machine_kexec_reloc.o

obj-$(findstring y, $(CONFIG_PROTECTED_VIRTUALIZATION_GUEST) $(CONFIG_PGSTE))	+= uv.o

obj-$(CONFIG_RELOCATABLE)	+= machine_kexec_reloc.o

obj-$(CONFIG_RANDOMIZE_BASE)	+= kaslr.o

obj-y	+= $(if $(CONFIG_KERNEL_UNCOMPRESSED),,decompressor.o) info.o

obj-$(CONFIG_KERNEL_ZSTD) += clz_ctz.o

arch/s390/boot/startup.c

+1 −2
Original line number Diff line number Diff line
@@ -291,7 +291,6 @@ void startup_kernel(void) 


	clear_bss_section();

	copy_bootdata();

	if (IS_ENABLED(CONFIG_RELOCATABLE))

	handle_relocs(__kaslr_offset);



	if (__kaslr_offset) {

arch/s390/configs/btf.config

0 → 100644
+1 −0
Original line number Diff line number Diff line 
CONFIG_DEBUG_INFO_BTF=y