From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 4 Jul 2021 19:17:38 +0000 (-0700)
Subject: Merge tag 's390-5.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
X-Git-Tag: v5.15~806
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2bb919b62f6e5959552a90a399d09d683afa3d1d;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 's390-5.14-1' of git://git./linux/kernel/git/s390/linux

Pull s390 updates from Vasily Gorbik:

 - Rework inline asm to get rid of error prone "register asm"
   constructs, which are problematic especially when code
   instrumentation is enabled.

   In particular introduce and use register pair union to allocate
   even/odd register pairs. Unfortunately this breaks compatibility with
   older clang compilers and minimum clang version for s390 has been
   raised to 13.

     https://lore.kernel.org/linux-next/CAK7LNARuSmPCEy-ak0erPrPTgZdGVypBROFhtw+=3spoGoYsyw@mail.gmail.com/

 - Fix gcc 11 warnings, which triggered various minor reworks all over
   the code.

 - Add zstd kernel image compression support.

 - Rework boot CPU lowcore handling.

 - De-duplicate and move kernel memory layout setup logic earlier.

 - Few fixes in preparation for FORTIFY_SOURCE performing compile-time
   and run-time field bounds checking for mem functions.

 - Remove broken and unused power management support leftovers in s390
   drivers.

 - Disable stack-protector for decompressor and purgatory to fix
   buildroot build.

 - Fix vt220 sclp console name to match the char device name.

 - Enable HAVE_IOREMAP_PROT and add zpci_set_irq()/zpci_clear_irq() in
   zPCI code.

 - Remove some implausible WARN_ON_ONCEs and remove arch specific
   counter transaction call backs in favour of default transaction
   handling in perf code.

 - Extend/add new uevents for online/config/mode state changes of AP
   card / queue device in zcrypt.

 - Minor entry and ccwgroup code improvements.

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

* tag 's390-5.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (91 commits)
  s390/dasd: use register pair instead of register asm
  s390/qdio: get rid of register asm
  s390/ioasm: use symbolic names for asm operands
  s390/ioasm: get rid of register asm
  s390/cmf: get rid of register asm
  s390/lib,string: get rid of register asm
  s390/lib,uaccess: get rid of register asm
  s390/string: get rid of register asm
  s390/cmpxchg: use register pair instead of register asm
  s390/mm,pages-states: get rid of register asm
  s390/lib,xor: get rid of register asm
  s390/timex: get rid of register asm
  s390/hypfs: use register pair instead of register asm
  s390/zcrypt: Switch to flexible array member
  s390/speculation: Use statically initialized const for instructions
  virtio/s390: get rid of open-coded kvm hypercall
  s390/pci: add zpci_set_irq()/zpci_clear_irq()
  scripts/min-tool-version.sh: Raise minimum clang version to 13.0.0 for s390
  s390/ipl: use register pair instead of register asm
  s390/mem_detect: fix tprot() program check new psw handling
  ...
---

2bb919b62f6e5959552a90a399d09d683afa3d1d
diff --cc drivers/s390/block/xpram.c
index 91ef710,9f19d47..ce98fab
--- a/drivers/s390/block/xpram.c
+++ b/drivers/s390/block/xpram.c
@@@ -427,11 -396,10 +389,9 @@@ static void __exit xpram_exit(void
  	int i;
  	for (i = 0; i < xpram_devs; i++) {
  		del_gendisk(xpram_disks[i]);
 -		blk_cleanup_queue(xpram_queues[i]);
 -		put_disk(xpram_disks[i]);
 +		blk_cleanup_disk(xpram_disks[i]);
  	}
  	unregister_blkdev(XPRAM_MAJOR, XPRAM_NAME);
- 	platform_device_unregister(xpram_pdev);
- 	platform_driver_unregister(&xpram_pdrv);
  }
  
  static int __init xpram_init(void)