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

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull s390 fixes and kexec-file-load from Martin Schwidefsky:
 "After the common code kexec patches went in via Andrew we can now push
  the architecture parts to implement the kexec-file-load system call.

  Plus a few more bug fixes and cleanups, this includes an update to the
  default configurations"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/signal: cleanup uapi struct sigaction
  s390: rename default_defconfig to debug_defconfig
  s390: remove gcov defconfig
  s390: update defconfig
  s390: add support for IBM z14 Model ZR1
  s390: remove couple of duplicate includes
  s390/boot: remove unused COMPILE_VERSION and ccflags-y
  s390/nospec: include cpu.h
  s390/decompressor: Ignore file vmlinux.bin.full
  s390/kexec_file: add generated files to .gitignore
  s390/Kconfig: Move kexec config options to "Processor type and features"
  s390/kexec_file: Add ELF loader
  s390/kexec_file: Add crash support to image loader
  s390/kexec_file: Add image loader
  s390/kexec_file: Add kexec_file_load system call
  s390/kexec_file: Add purgatory
  s390/kexec_file: Prepare setup.h for kexec_file_load
  s390/smsgiucv: disable SMSG on module unload
  s390/sclp: avoid potential usage of uninitialized value
parents 87ef1202 fae76491

arch/s390/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -8,3 +8,4 @@ obj-$(CONFIG_APPLDATA_BASE) += appldata/ 
obj-y				+= net/

obj-$(CONFIG_PCI)		+= pci/

obj-$(CONFIG_NUMA)		+= numa/

obj-$(CONFIG_ARCH_HAS_KEXEC_PURGATORY) += purgatory/

arch/s390/Kconfig

+24 −8
Original line number Diff line number Diff line
@@ -47,10 +47,6 @@ config PGSTE 
config ARCH_SUPPORTS_DEBUG_PAGEALLOC

	def_bool y



config KEXEC

	def_bool y

	select KEXEC_CORE



config AUDIT_ARCH

	def_bool y
@@ -290,12 +286,12 @@ config MARCH_Z13 
	  older machines.



config MARCH_Z14

	bool "IBM z14"

	bool "IBM z14 ZR1 and z14"

	select HAVE_MARCH_Z14_FEATURES

	help

	  Select this to enable optimizations for IBM z14 (3906 series).

	  The kernel will be slightly faster but will not work on older

	  machines.

	  Select this to enable optimizations for IBM z14 ZR1 and z14 (3907

	  and 3906 series). The kernel will be slightly faster but will not

	  work on older machines.



endchoice
@@ -525,6 +521,26 @@ source kernel/Kconfig.preempt 


source kernel/Kconfig.hz



config KEXEC

	def_bool y

	select KEXEC_CORE



config KEXEC_FILE

	bool "kexec file based system call"

	select KEXEC_CORE

	select BUILD_BIN2C

	depends on CRYPTO

	depends on CRYPTO_SHA256

	depends on CRYPTO_SHA256_S390

	help

	  Enable the kexec file based system call. In contrast to the normal

	  kexec system call this system call takes file descriptors for the

	  kernel and initramfs as arguments.



config ARCH_HAS_KEXEC_PURGATORY

	def_bool y

	depends on KEXEC_FILE



config ARCH_RANDOM

	def_bool y

	prompt "s390 architectural random number generation API"

arch/s390/boot/Makefile

+0 −6
Original line number Diff line number Diff line
@@ -3,12 +3,6 @@ 
# Makefile for the linux s390-specific parts of the memory manager.

#



COMPILE_VERSION := __linux_compile_version_id__`hostname |  \

			tr -c '[0-9A-Za-z]' '_'`__`date | \

			tr -c '[0-9A-Za-z]' '_'`_t



ccflags-y  := -DCOMPILE_VERSION=$(COMPILE_VERSION) -gstabs -I.



targets := image

targets += bzImage

subdir- := compressed

arch/s390/boot/compressed/.gitignore

+1 −0
Original line number Diff line number Diff line 
sizes.h

vmlinux

vmlinux.lds

vmlinux.bin.full

arch/s390/configs/default_defconfig→arch/s390/configs/debug_defconfig

+20 −10
Original line number Diff line number Diff line
@@ -24,13 +24,13 @@ CONFIG_CPUSETS=y 
CONFIG_CGROUP_DEVICE=y

CONFIG_CGROUP_CPUACCT=y

CONFIG_CGROUP_PERF=y

CONFIG_CHECKPOINT_RESTORE=y

CONFIG_NAMESPACES=y

CONFIG_USER_NS=y

CONFIG_SCHED_AUTOGROUP=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_EXPERT=y

# CONFIG_SYSFS_SYSCALL is not set

CONFIG_CHECKPOINT_RESTORE=y

CONFIG_BPF_SYSCALL=y

CONFIG_USERFAULTFD=y

# CONFIG_COMPAT_BRK is not set
@@ -59,10 +59,11 @@ CONFIG_CFQ_GROUP_IOSCHED=y 
CONFIG_DEFAULT_DEADLINE=y

CONFIG_LIVEPATCH=y

CONFIG_TUNE_ZEC12=y

CONFIG_NR_CPUS=256

CONFIG_NR_CPUS=512

CONFIG_NUMA=y

CONFIG_PREEMPT=y

CONFIG_HZ_100=y

CONFIG_KEXEC_FILE=y

CONFIG_MEMORY_HOTPLUG=y

CONFIG_MEMORY_HOTREMOVE=y

CONFIG_KSM=y
@@ -305,7 +306,6 @@ CONFIG_IP6_NF_SECURITY=m 
CONFIG_IP6_NF_NAT=m

CONFIG_IP6_NF_TARGET_MASQUERADE=m

CONFIG_NF_TABLES_BRIDGE=m

CONFIG_NET_SCTPPROBE=m

CONFIG_RDS=m

CONFIG_RDS_RDMA=m

CONFIG_RDS_TCP=m
@@ -364,11 +364,11 @@ CONFIG_NET_ACT_SIMP=m 
CONFIG_NET_ACT_SKBEDIT=m

CONFIG_NET_ACT_CSUM=m

CONFIG_DNS_RESOLVER=y

CONFIG_OPENVSWITCH=m

CONFIG_NETLINK_DIAG=m

CONFIG_CGROUP_NET_PRIO=y

CONFIG_BPF_JIT=y

CONFIG_NET_PKTGEN=m

CONFIG_NET_TCPPROBE=m

CONFIG_DEVTMPFS=y

CONFIG_DMA_CMA=y

CONFIG_CMA_SIZE_MBYTES=0
@@ -380,9 +380,9 @@ CONFIG_BLK_DEV_DRBD=m 
CONFIG_BLK_DEV_NBD=m

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=32768

CONFIG_BLK_DEV_RAM_DAX=y

CONFIG_VIRTIO_BLK=y

CONFIG_BLK_DEV_RBD=m

CONFIG_BLK_DEV_NVME=m

CONFIG_ENCLOSURE_SERVICES=m

CONFIG_GENWQE=m

CONFIG_RAID_ATTRS=m
@@ -461,6 +461,7 @@ CONFIG_PPTP=m 
CONFIG_PPPOL2TP=m

CONFIG_PPP_ASYNC=m

CONFIG_PPP_SYNC_TTY=m

CONFIG_INPUT_EVDEV=y

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

# CONFIG_SERIO is not set
@@ -474,6 +475,9 @@ CONFIG_WATCHDOG=y 
CONFIG_WATCHDOG_NOWAYOUT=y

CONFIG_SOFT_WATCHDOG=m

CONFIG_DIAG288_WATCHDOG=m

CONFIG_DRM=y

CONFIG_DRM_VIRTIO_GPU=y

CONFIG_FRAMEBUFFER_CONSOLE=y

# CONFIG_HID is not set

# CONFIG_USB_SUPPORT is not set

CONFIG_INFINIBAND=m
@@ -482,7 +486,9 @@ CONFIG_MLX4_INFINIBAND=m 
CONFIG_MLX5_INFINIBAND=m

CONFIG_VFIO=m

CONFIG_VFIO_PCI=m

CONFIG_VIRTIO_PCI=m

CONFIG_VIRTIO_BALLOON=m

CONFIG_VIRTIO_INPUT=y

CONFIG_EXT4_FS=y

CONFIG_EXT4_FS_POSIX_ACL=y

CONFIG_EXT4_FS_SECURITY=y
@@ -641,6 +647,8 @@ CONFIG_ATOMIC64_SELFTEST=y 
CONFIG_TEST_BPF=m

CONFIG_BUG_ON_DATA_CORRUPTION=y

CONFIG_S390_PTDUMP=y

CONFIG_PERSISTENT_KEYRINGS=y

CONFIG_BIG_KEYS=y

CONFIG_ENCRYPTED_KEYS=m

CONFIG_SECURITY=y

CONFIG_SECURITY_NETWORK=y
@@ -649,17 +657,20 @@ CONFIG_SECURITY_SELINUX=y 
CONFIG_SECURITY_SELINUX_BOOTPARAM=y

CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0

CONFIG_SECURITY_SELINUX_DISABLE=y

CONFIG_INTEGRITY_SIGNATURE=y

CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y

CONFIG_IMA=y

CONFIG_IMA_DEFAULT_HASH_SHA256=y

CONFIG_IMA_WRITE_POLICY=y

CONFIG_IMA_APPRAISE=y

CONFIG_CRYPTO_RSA=m

CONFIG_CRYPTO_DH=m

CONFIG_CRYPTO_ECDH=m

CONFIG_CRYPTO_USER=m

# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set

CONFIG_CRYPTO_PCRYPT=m

CONFIG_CRYPTO_CRYPTD=m

CONFIG_CRYPTO_MCRYPTD=m

CONFIG_CRYPTO_TEST=m

CONFIG_CRYPTO_GCM=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_LRW=m

CONFIG_CRYPTO_PCBC=m
@@ -707,9 +718,8 @@ CONFIG_CRYPTO_DES_S390=m 
CONFIG_CRYPTO_AES_S390=m

CONFIG_CRYPTO_GHASH_S390=m

CONFIG_CRYPTO_CRC32_S390=y

CONFIG_ASYMMETRIC_KEY_TYPE=y

CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m

CONFIG_X509_CERTIFICATE_PARSER=m

CONFIG_PKCS7_MESSAGE_PARSER=y

CONFIG_SYSTEM_TRUSTED_KEYRING=y

CONFIG_CRC7=m

CONFIG_CRC8=m

CONFIG_RANDOM32_SELFTEST=y

CRA Git | Maintained and supported by SUSTech CRA and CCSE