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

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

Pull more s390 updates from Heiko Carstens:
 "Except for the xpram device driver removal it is all about fixes and
  cleanups.

   - Fix topology update on cpu hotplug, so notifiers see expected
     masks. This bug was uncovered with SCHED_CORE support.

   - Fix stack unwinding so that the correct number of entries are
     omitted like expected by common code. This fixes KCSAN selftests.

   - Add kmemleak annotation to stack_alloc to avoid false positive
     kmemleak warnings.

   - Avoid layering violation in common I/O code and don't unregister
     subchannel from child-drivers.

   - Remove xpram device driver for which no real use case exists since
     the kernel is 64 bit only. Also all hypervisors got required
     support removed in the meantime, which means the xpram device
     driver is dead code.

   - Fix -ENODEV handling of clp_get_state in our PCI code.

   - Enable KFENCE in debug defconfig.

   - Cleanup hugetlbfs s390 specific Kconfig dependency.

   - Quite a lot of trivial fixes to get rid of "W=1" warnings, and and
     other simple cleanups"

* tag 's390-5.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  hugetlbfs: s390 is always 64bit
  s390/ftrace: remove incorrect __va usage
  s390/zcrypt: remove incorrect kernel doc indicators
  scsi: zfcp: fix kernel doc comments
  s390/sclp: add __nonstring annotation
  s390/hmcdrv_ftp: fix kernel doc comment
  s390: remove xpram device driver
  s390/pci: read clp_list_pci_req only once
  s390/pci: fix clp_get_state() handling of -ENODEV
  s390/cio: fix kernel doc comment
  s390/ctrlchar: fix kernel doc comment
  s390/con3270: use proper type for tasklet function
  s390/cpum_cf: move array from header to C file
  s390/mm: fix kernel doc comments
  s390/topology: fix topology information when calling cpu hotplug notifiers
  s390/unwind: use current_frame_address() to unwind current task
  s390/configs: enable CONFIG_KFENCE in debug_defconfig
  s390/entry: make oklabel within CHKSTG macro local
  s390: add kmemleak annotation in stack_alloc()
  s390/cio: dont unregister subchannel from child-drivers
parents 7b871c77 bb9c14ad

arch/s390/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ config S390 
	select ARCH_STACKWALK

	select ARCH_SUPPORTS_ATOMIC_RMW

	select ARCH_SUPPORTS_DEBUG_PAGEALLOC

	select ARCH_SUPPORTS_HUGETLBFS

	select ARCH_SUPPORTS_NUMA_BALANCING

	select ARCH_USE_BUILTIN_BSWAP

	select ARCH_USE_CMPXCHG_LOCKREF

arch/s390/configs/debug_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -804,6 +804,7 @@ CONFIG_DEBUG_VM_PGFLAGS=y 
CONFIG_DEBUG_MEMORY_INIT=y

CONFIG_MEMORY_NOTIFIER_ERROR_INJECT=m

CONFIG_DEBUG_PER_CPU_MAPS=y

CONFIG_KFENCE=y

CONFIG_DEBUG_SHIRQ=y

CONFIG_PANIC_ON_OOPS=y

CONFIG_DETECT_HUNG_TASK=y

arch/s390/configs/defconfig

+0 −1
Original line number Diff line number Diff line
@@ -397,7 +397,6 @@ CONFIG_BLK_DEV_DRBD=m 
CONFIG_BLK_DEV_NBD=m

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=32768

# CONFIG_BLK_DEV_XPRAM is not set

CONFIG_VIRTIO_BLK=y

CONFIG_BLK_DEV_RBD=m

CONFIG_BLK_DEV_NVME=m

arch/s390/configs/zfcpdump_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ CONFIG_NET=y 
# CONFIG_ETHTOOL_NETLINK is not set

CONFIG_DEVTMPFS=y

CONFIG_BLK_DEV_RAM=y

# CONFIG_BLK_DEV_XPRAM is not set

# CONFIG_DCSSBLK is not set

# CONFIG_DASD is not set

CONFIG_ENCLOSURE_SERVICES=y

arch/s390/include/asm/cpu_mcf.h

+0 −7
Original line number Diff line number Diff line
@@ -24,13 +24,6 @@ enum cpumf_ctr_set { 


#define CPUMF_LCCTL_ENABLE_SHIFT    16

#define CPUMF_LCCTL_ACTCTL_SHIFT     0

static const u64 cpumf_ctr_ctl[CPUMF_CTR_SET_MAX] = {

	[CPUMF_CTR_SET_BASIC]	= 0x02,

	[CPUMF_CTR_SET_USER]	= 0x04,

	[CPUMF_CTR_SET_CRYPTO]	= 0x08,

	[CPUMF_CTR_SET_EXT]	= 0x01,

	[CPUMF_CTR_SET_MT_DIAG] = 0x20,

};



static inline void ctr_set_enable(u64 *state, u64 ctrsets)

{