Commit 80111bfb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 's390-5.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull more s390 updates from Martin Schwidefsky:

 - Enhancements for the QDIO layer

 - Remove the RCP trace event

 - Avoid three build issues

 - Move the defconfig to the configs directory

* tag 's390-5.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390: move arch/s390/defconfig to arch/s390/configs/defconfig
  s390/qdio: optimize state inspection of HW-owned SBALs
  s390/qdio: use get_buf_state() in debug_get_buf_state()
  s390/qdio: allow to scan all Output SBALs in one go
  s390/cio: Remove tracing for rchp instruction
  s390/kasan: adapt disabled_wait usage to avoid build error
  latent_entropy: avoid build error when plugin cflags are not set
  s390/boot: fix compiler error due to missing awk strtonum
parents bf8a9a47 f3e20ad6

arch/s390/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ 
# Copyright (C) 1994 by Linus Torvalds

#



KBUILD_DEFCONFIG := defconfig



LD_BFD		:= elf64-s390

KBUILD_LDFLAGS	:= -m elf64_s390

KBUILD_AFLAGS_MODULE += -fPIC

arch/s390/boot/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ define cmd_section_cmp 
	touch $@

endef



OBJCOPYFLAGS_bzImage := --pad-to $$(readelf -s $(obj)/compressed/vmlinux | awk '/\<_end\>/ {print or(strtonum("0x"$$2),4095)+1}')

$(obj)/bzImage: $(obj)/compressed/vmlinux $(obj)/section_cmp.boot.data $(obj)/section_cmp.boot.preserved.data FORCE

	$(call if_changed,objcopy)

arch/s390/boot/compressed/vmlinux.lds.S

+2 −0
Original line number Diff line number Diff line
@@ -77,6 +77,8 @@ SECTIONS 
		_compressed_start = .;

		*(.vmlinux.bin.compressed)

		_compressed_end = .;

		FILL(0xff);

		. = ALIGN(4096);

	}

	. = ALIGN(256);

	.bss : {

arch/s390/defconfig→arch/s390/configs/defconfig

+0 −0

File moved.

View file

arch/s390/mm/kasan_init.c

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ static void __init kasan_early_panic(const char *reason) 
{

	sclp_early_printk("The Linux kernel failed to boot with the KernelAddressSanitizer:\n");

	sclp_early_printk(reason);

	disabled_wait(0);

	disabled_wait();

}



static void * __init kasan_early_alloc_segment(void)

CRA Git | Maintained and supported by SUSTech CRA and CCSE