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

Pull more s390 updates from Heiko Carstens:

 - A couple of virtual vs physical address confusion fixes

 - Rework locking in dcssblk driver to address a lockdep warning

 - Remove support for "noexec" kernel command line option since there is
   no use case where it would make sense

 - Simplify kernel mapping setup and get rid of quite a bit of code

 - Add architecture specific __set_memory_yy() functions which allow us
   to modify kernel mappings. Unlike the set_memory_xx() variants they
   take void pointer start and end parameters, which allows using them
   without the usual casts, and also to use them on areas larger than
   8TB.

   Note that the set_memory_xx() family comes with an int num_pages
   parameter which overflows with 8TB. This could be addressed by
   changing the num_pages parameter to unsigned long, however requires
   to change all architectures, since the module code expects an int
   parameter (see module_set_memory()).

   This was indeed an issue since for debug_pagealloc() we call
   set_memory_4k() on the whole identity mapping. Therefore address this
   for now with the __set_memory_yy() variant, and address common code
   later

 - Use dev_set_name() and also fix memory leak in zcrypt driver error
   handling

 - Remove unused lsi_mask from airq_struct

 - Add warning for invalid kernel mapping requests

* tag 's390-6.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/vmem: do not silently ignore mapping limit
  s390/zcrypt: utilize dev_set_name() ability to use a formatted string
  s390/zcrypt: don't leak memory if dev_set_name() fails
  s390/mm: fix MAX_DMA_ADDRESS physical vs virtual confusion
  s390/airq: remove lsi_mask from airq_struct
  s390/mm: use __set_memory() variants where useful
  s390/set_memory: add __set_memory() variant
  s390/set_memory: generate all set_memory() functions
  s390/mm: improve description of mapping permissions of prefix pages
  s390/amode31: change type of __samode31, __eamode31, etc
  s390/mm: simplify kernel mapping setup
  s390: remove "noexec" option
  s390/vmem: fix virtual vs physical address confusion
  s390/dcssblk: fix lockdep warning
  s390/monreader: fix virtual vs physical address confusion

diff --combined arch/s390/mm/pageattr.c
index e5ec76271b160e4b398df9fc4918a6b7ea02b31b,43c919c7bafb23fd8d83d9395bc2dbc3029e6e81..b87e96c64b61d218e2a05570892ec30537d9985f
--- 1/arch/s390/mm/pageattr.c
--- 2/arch/s390/mm/pageattr.c
+++ b/arch/s390/mm/pageattr.c
@@@ -98,7 -98,7 +98,7 @@@ static int walk_pte_level(pmd_t *pmdp, 
                if (flags & SET_MEMORY_RO)
                        new = pte_wrprotect(new);
                else if (flags & SET_MEMORY_RW)
 -                      new = pte_mkwrite(pte_mkdirty(new));
 +                      new = pte_mkwrite_novma(pte_mkdirty(new));
                if (flags & SET_MEMORY_NX)
                        new = set_pte_bit(new, __pgprot(_PAGE_NOEXEC));
                else if (flags & SET_MEMORY_X)
@@@ -156,7 -156,7 +156,7 @@@ static void modify_pmd_page(pmd_t *pmdp
        if (flags & SET_MEMORY_RO)
                new = pmd_wrprotect(new);
        else if (flags & SET_MEMORY_RW)
 -              new = pmd_mkwrite(pmd_mkdirty(new));
 +              new = pmd_mkwrite_novma(pmd_mkdirty(new));
        if (flags & SET_MEMORY_NX)
                new = set_pmd_bit(new, __pgprot(_SEGMENT_ENTRY_NOEXEC));
        else if (flags & SET_MEMORY_X)
@@@ -373,7 -373,7 +373,7 @@@ static int change_page_attr_alias(unsig
        return rc;
  }
  
- int __set_memory(unsigned long addr, int numpages, unsigned long flags)
+ int __set_memory(unsigned long addr, unsigned long numpages, unsigned long flags)
  {
        unsigned long end;
        int rc;