Commit 591dd4c1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull s390 fixes from Vasily Gorbik:

 - Remove ieee_emulation_warnings sysctl which is a dead code.

 - Avoid triggering rebuild of the kernel during make install.

 - Enable protected virtualization guest support in default configs.

 - Fix cio_ignore seq_file .next function to increase position index.
   And use kobj_to_dev instead of container_of in cio code.

 - Fix storage block address lists to contain absolute addresses in qdio
   code.

 - Few clang warnings and spelling fixes.

* tag 's390-5.6-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/qdio: fill SBALEs with absolute addresses
  s390/qdio: fill SL with absolute addresses
  s390: remove obsolete ieee_emulation_warnings
  s390: make 'install' not depend on vmlinux
  s390/kaslr: Fix casts in get_random
  s390/mm: Explicitly compare PAGE_DEFAULT_KEY against zero in storage_key_init_range
  s390/pkey/zcrypt: spelling s/crytp/crypt/
  s390/cio: use kobj_to_dev() API
  s390/defconfig: enable CONFIG_PROTECTED_VIRTUALIZATION_GUEST
  s390/cio: cio_ignore_proc_seq_next should increase position index
parents 54dedb5b 2db01da8

arch/s390/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ all: bzImage 
#KBUILD_IMAGE is necessary for packaging targets like rpm-pkg, deb-pkg...

KBUILD_IMAGE	:= $(boot)/bzImage



install: vmlinux

install:

	$(Q)$(MAKE) $(build)=$(boot) $@



bzImage: vmlinux

arch/s390/boot/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ $(obj)/compressed/vmlinux: $(obj)/startup.a FORCE 
$(obj)/startup.a: $(OBJECTS) FORCE

	$(call if_changed,ar)



install: $(CONFIGURE) $(obj)/bzImage

install:

	sh -x  $(srctree)/$(obj)/install.sh $(KERNELRELEASE) $(obj)/bzImage \

	      System.map "$(INSTALL_PATH)"

arch/s390/boot/kaslr.c

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ static unsigned long get_random(unsigned long limit) 
		*(unsigned long *) prng.parm_block ^= seed;

		for (i = 0; i < 16; i++) {

			cpacf_kmc(CPACF_KMC_PRNG, prng.parm_block,

				  (char *) entropy, (char *) entropy,

				  (u8 *) entropy, (u8 *) entropy,

				  sizeof(entropy));

			memcpy(prng.parm_block, entropy, sizeof(entropy));

		}

arch/s390/configs/debug_defconfig

+13 −15
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ CONFIG_VFIO_AP=m 
CONFIG_CRASH_DUMP=y

CONFIG_HIBERNATION=y

CONFIG_PM_DEBUG=y

CONFIG_PROTECTED_VIRTUALIZATION_GUEST=y

CONFIG_CMM=m

CONFIG_APPLDATA_BASE=y

CONFIG_KVM=m
@@ -474,7 +475,6 @@ CONFIG_NLMON=m 
# CONFIG_NET_VENDOR_EMULEX is not set

# CONFIG_NET_VENDOR_EZCHIP is not set

# CONFIG_NET_VENDOR_GOOGLE is not set

# CONFIG_NET_VENDOR_HP is not set

# CONFIG_NET_VENDOR_HUAWEI is not set

# CONFIG_NET_VENDOR_INTEL is not set

# CONFIG_NET_VENDOR_MARVELL is not set
@@ -684,7 +684,6 @@ CONFIG_CRYPTO_ADIANTUM=m 
CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_CRC32=m

CONFIG_CRYPTO_XXHASH=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD128=m

CONFIG_CRYPTO_RMD160=m
@@ -748,7 +747,6 @@ CONFIG_DEBUG_INFO_DWARF4=y 
CONFIG_GDB_SCRIPTS=y

CONFIG_FRAME_WARN=1024

CONFIG_HEADERS_INSTALL=y

CONFIG_HEADERS_CHECK=y

CONFIG_DEBUG_SECTION_MISMATCH=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_PAGEALLOC=y
@@ -772,9 +770,9 @@ CONFIG_DEBUG_MEMORY_INIT=y 
CONFIG_MEMORY_NOTIFIER_ERROR_INJECT=m

CONFIG_DEBUG_PER_CPU_MAPS=y

CONFIG_DEBUG_SHIRQ=y

CONFIG_PANIC_ON_OOPS=y

CONFIG_DETECT_HUNG_TASK=y

CONFIG_WQ_WATCHDOG=y

CONFIG_PANIC_ON_OOPS=y

CONFIG_DEBUG_TIMEKEEPING=y

CONFIG_PROVE_LOCKING=y

CONFIG_LOCK_STAT=y
@@ -783,9 +781,20 @@ CONFIG_DEBUG_ATOMIC_SLEEP=y 
CONFIG_DEBUG_LOCKING_API_SELFTESTS=y

CONFIG_DEBUG_SG=y

CONFIG_DEBUG_NOTIFIERS=y

CONFIG_BUG_ON_DATA_CORRUPTION=y

CONFIG_DEBUG_CREDENTIALS=y

CONFIG_RCU_TORTURE_TEST=m

CONFIG_RCU_CPU_STALL_TIMEOUT=300

CONFIG_LATENCYTOP=y

CONFIG_FUNCTION_PROFILER=y

CONFIG_STACK_TRACER=y

CONFIG_IRQSOFF_TRACER=y

CONFIG_PREEMPT_TRACER=y

CONFIG_SCHED_TRACER=y

CONFIG_FTRACE_SYSCALLS=y

CONFIG_BLK_DEV_IO_TRACE=y

CONFIG_HIST_TRIGGERS=y

CONFIG_S390_PTDUMP=y

CONFIG_NOTIFIER_ERROR_INJECTION=m

CONFIG_NETDEV_NOTIFIER_ERROR_INJECT=m

CONFIG_FAULT_INJECTION=y
@@ -796,15 +805,6 @@ CONFIG_FAIL_IO_TIMEOUT=y 
CONFIG_FAIL_FUTEX=y

CONFIG_FAULT_INJECTION_DEBUG_FS=y

CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y

CONFIG_LATENCYTOP=y

CONFIG_IRQSOFF_TRACER=y

CONFIG_PREEMPT_TRACER=y

CONFIG_SCHED_TRACER=y

CONFIG_FTRACE_SYSCALLS=y

CONFIG_STACK_TRACER=y

CONFIG_BLK_DEV_IO_TRACE=y

CONFIG_FUNCTION_PROFILER=y

CONFIG_HIST_TRIGGERS=y

CONFIG_LKDTM=m

CONFIG_TEST_LIST_SORT=y

CONFIG_TEST_SORT=y
@@ -814,5 +814,3 @@ CONFIG_INTERVAL_TREE_TEST=m 
CONFIG_PERCPU_TEST=m

CONFIG_ATOMIC64_SELFTEST=y

CONFIG_TEST_BPF=m
 
CONFIG_BUG_ON_DATA_CORRUPTION=y

CONFIG_S390_PTDUMP=y

arch/s390/configs/defconfig

+5 −6
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ CONFIG_VFIO_AP=m 
CONFIG_CRASH_DUMP=y

CONFIG_HIBERNATION=y

CONFIG_PM_DEBUG=y

CONFIG_PROTECTED_VIRTUALIZATION_GUEST=y

CONFIG_CMM=m

CONFIG_APPLDATA_BASE=y

CONFIG_KVM=m
@@ -470,7 +471,6 @@ CONFIG_NLMON=m 
# CONFIG_NET_VENDOR_EMULEX is not set

# CONFIG_NET_VENDOR_EZCHIP is not set

# CONFIG_NET_VENDOR_GOOGLE is not set

# CONFIG_NET_VENDOR_HP is not set

# CONFIG_NET_VENDOR_HUAWEI is not set

# CONFIG_NET_VENDOR_INTEL is not set

# CONFIG_NET_VENDOR_MARVELL is not set
@@ -677,7 +677,6 @@ CONFIG_CRYPTO_ADIANTUM=m 
CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_CRC32=m

CONFIG_CRYPTO_XXHASH=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD128=m

CONFIG_CRYPTO_RMD160=m
@@ -739,18 +738,18 @@ CONFIG_DEBUG_SECTION_MISMATCH=y 
CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_MEMORY_INIT=y

CONFIG_PANIC_ON_OOPS=y

CONFIG_BUG_ON_DATA_CORRUPTION=y

CONFIG_RCU_TORTURE_TEST=m

CONFIG_RCU_CPU_STALL_TIMEOUT=60

CONFIG_LATENCYTOP=y

CONFIG_FUNCTION_PROFILER=y

CONFIG_STACK_TRACER=y

CONFIG_SCHED_TRACER=y

CONFIG_FTRACE_SYSCALLS=y

CONFIG_STACK_TRACER=y

CONFIG_BLK_DEV_IO_TRACE=y

CONFIG_FUNCTION_PROFILER=y

CONFIG_HIST_TRIGGERS=y

CONFIG_S390_PTDUMP=y

CONFIG_LKDTM=m

CONFIG_PERCPU_TEST=m

CONFIG_ATOMIC64_SELFTEST=y

CONFIG_TEST_BPF=m
 
CONFIG_BUG_ON_DATA_CORRUPTION=y

CONFIG_S390_PTDUMP=y

CRA Git | Maintained and supported by SUSTech CRA and CCSE