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

Merge tag 's390-5.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull s390 updates from Vasily Gorbik:

 - Update maintainers. Niklas Schnelle takes over zpci and Vineeth
   Vijayan common io code.

 - Extend cpuinfo to include topology information.

 - Add new extended counters for IBM z15 and sampling buffer allocation
   rework in perf code.

 - Add control over zeroing out memory during system restart.

 - CCA protected key block version 2 support and other
   fixes/improvements in crypto code.

 - Convert to new fallthrough; annotations.

 - Replace zero-length arrays with flexible-arrays.

 - QDIO debugfs and other small improvements.

 - Drop 2-level paging support optimization for compat tasks. Varios mm
   cleanups.

 - Remove broken and unused hibernate / power management support.

 - Remove fake numa support which does not bring any benefits.

 - Exclude offline CPUs from CPU topology masks to be more consistent
   with other architectures.

 - Prevent last branching instruction address leaking to userspace.

 - Other small various fixes and improvements all over the code.

* tag 's390-5.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (57 commits)
  s390/mm: cleanup init_new_context() callback
  s390/mm: cleanup virtual memory constants usage
  s390/mm: remove page table downgrade support
  s390/qdio: set qdio_irq->cdev at allocation time
  s390/qdio: remove unused function declarations
  s390/ccwgroup: remove pm support
  s390/ap: remove power management code from ap bus and drivers
  s390/zcrypt: use kvmalloc instead of kmalloc for 256k alloc
  s390/mm: cleanup arch_get_unmapped_area() and friends
  s390/ism: remove pm support
  s390/cio: use fallthrough;
  s390/vfio: use fallthrough;
  s390/zcrypt: use fallthrough;
  s390: use fallthrough;
  s390/cpum_sf: Fix wrong page count in error message
  s390/diag: fix display of diagnose call statistics
  s390/ap: Remove ap device suspend and resume callbacks
  s390/pci: Improve handling of unset UID
  s390/pci: Fix zpci_alloc_domain() over allocation
  s390/qdio: pass ISC as parameter to chsc_sadc()
  ...
parents 5364abc5 1058c163

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -14613,7 +14613,7 @@ F: Documentation/s390/ 
F:	Documentation/driver-api/s390-drivers.rst















S390 COMMON I/O LAYER













M:	Sebastian Ott <sebott@linux.ibm.com>













M:	Vineeth Vijayan <vneethv@linux.ibm.com>















M:	Peter Oberparleiter <oberpar@linux.ibm.com>















L:	linux-s390@vger.kernel.org















W:	http://www.ibm.com/developerworks/linux/linux390/










@@ -14655,7 +14655,7 @@ S:	Supported













F:	drivers/s390/net/





























S390 PCI SUBSYSTEM













M:	Sebastian Ott <sebott@linux.ibm.com>













M:	Niklas Schnelle <schnelle@linux.ibm.com>















M:	Gerald Schaefer <gerald.schaefer@de.ibm.com>















L:	linux-s390@vger.kernel.org















W:	http://www.ibm.com/developerworks/linux/linux390/

































arch/s390/Kconfig



+3
−70






























Original line number
Diff line number
Diff line








@@ -102,13 +102,13 @@ config S390













	select ARCH_INLINE_WRITE_UNLOCK_IRQ















	select ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE















	select ARCH_KEEP_MEMBLOCK













	select ARCH_SAVE_PAGE_KEYS if HIBERNATION















	select ARCH_STACKWALK















	select ARCH_SUPPORTS_ATOMIC_RMW















	select ARCH_SUPPORTS_NUMA_BALANCING















	select ARCH_USE_BUILTIN_BSWAP















	select ARCH_USE_CMPXCHG_LOCKREF















	select ARCH_WANTS_DYNAMIC_TASK_STRUCT













	select ARCH_WANT_DEFAULT_BPF_JIT















	select ARCH_WANT_IPC_PARSE_VERSION















	select BUILDTIME_TABLE_SORT















	select CLONE_BACKWARDS2










@@ -451,14 +451,6 @@ config NR_CPUS













config HOTPLUG_CPU















	def_bool y





























# Some NUMA nodes have memory ranges that span













# other nodes.	Even though a pfn is valid and













# between a node's start and end pfns, it may not













# reside on that node.	See memmap_init_zone()













# for details. <- They meant memory holes!













config NODES_SPAN_OTHER_NODES













	def_bool NUMA





























config NUMA















	bool "NUMA support"















	depends on SCHED_TOPOLOGY









@@ -468,58 +460,9 @@ config NUMA





























	  This option adds NUMA support to the kernel.





























	  An operation mode can be selected by appending













	  numa=<method> to the kernel command line.



























	  The default behaviour is identical to appending numa=plain to













	  the command line. This will create just one node with all













	  available memory and all CPUs in it.





























config NODES_SHIFT













	int "Maximum NUMA nodes (as a power of 2)"













	range 1 10













	depends on NUMA













	default "4"













	help













	  Specify the maximum number of NUMA nodes available on the target













	  system. Increases memory reserved to accommodate various tables.



























menu "Select NUMA modes"













	depends on NUMA



























config NUMA_EMU













	bool "NUMA emulation"













	default y













	help













	  Numa emulation mode will split the available system memory into













	  equal chunks which then are distributed over the configured number













	  of nodes in a round-robin manner.



























	  The number of fake nodes is limited by the number of available memory













	  chunks (i.e. memory size / fake size) and the number of supported













	  nodes in the kernel.



























	  The CPUs are assigned to the nodes in a way that partially respects













	  the original machine topology (if supported by the machine).













	  Fair distribution of the CPUs is not guaranteed.



























config EMU_SIZE













	hex "NUMA emulation memory chunk size"













	default 0x10000000













	range 0x400000 0x100000000













	depends on NUMA_EMU













	help













	  Select the default size by which the memory is chopped and then













	  assigned to emulated NUMA nodes.



























	  This can be overridden by specifying



























	  emu_size=<n>



























	  on the kernel command line where also suffixes K, M, G, and T are













	  supported.



























endmenu













	int













	default "1"































config SCHED_SMT















	def_bool n










@@ -867,15 +810,6 @@ config SECCOMP





























	  If unsure, say Y.





























menu "Power Management"



























config ARCH_HIBERNATION_POSSIBLE













	def_bool y



























source "kernel/power/Kconfig"



























endmenu





























config CCW















	def_bool y


























@@ -1010,7 +944,6 @@ config S390_GUEST













	select TTY















	select VIRTUALIZATION















	select VIRTIO













	select VIRTIO_CONSOLE















	help















	  Enabling this option adds support for virtio based paravirtual device















	  drivers on s390.

































arch/s390/appldata/appldata_os.c



+1
−1






























Original line number
Diff line number
Diff line








@@ -75,7 +75,7 @@ struct appldata_os_data {













				   (waiting for I/O)               */































	/* per cpu data */













	struct appldata_os_per_cpu os_cpu[0];













	struct appldata_os_per_cpu os_cpu[];















} __attribute__((packed));































static struct appldata_os_data *appldata_os_data;

































arch/s390/boot/install.sh



+6
−11






























Original line number
Diff line number
Diff line








@@ -21,15 +21,10 @@













if [ -x ~/bin/${INSTALLKERNEL} ]; then exec ~/bin/${INSTALLKERNEL} "$@"; fi















if [ -x /sbin/${INSTALLKERNEL} ]; then exec /sbin/${INSTALLKERNEL} "$@"; fi





























# Default install - same as make zlilo













echo "Warning: '${INSTALLKERNEL}' command not available - additional " \













     "bootloader config required" >&2













if [ -f $4/vmlinuz-$1 ]; then mv $4/vmlinuz-$1 $4/vmlinuz-$1.old; fi













if [ -f $4/System.map-$1 ]; then mv $4/System.map-$1 $4/System.map-$1.old; fi





























if [ -f $4/vmlinuz ]; then













	mv $4/vmlinuz $4/vmlinuz.old













fi



























if [ -f $4/System.map ]; then













	mv $4/System.map $4/System.old













fi



























cat $2 > $4/vmlinuz













cp $3 $4/System.map












cat $2 > $4/vmlinuz-$1













cp $3 $4/System.map-$1
























arch/s390/configs/debug_defconfig



+1
−0






























Original line number
Diff line number
Diff line








@@ -532,6 +532,7 @@ CONFIG_INPUT_EVDEV=y













# CONFIG_SERIO is not set















CONFIG_LEGACY_PTY_COUNT=0















CONFIG_NULL_TTY=m













CONFIG_VIRTIO_CONSOLE=y















CONFIG_HW_RANDOM_VIRTIO=m















CONFIG_RAW_DRIVER=m















CONFIG_HANGCHECK_TIMER=m









































































CRA Git | Maintained and supported by SUSTech CRA and CCSE