Merge branch 'akpm' (patches from Andrew)

Merge more updates from Andrew Morton:
 "VM:
   - z3fold fixes and enhancements by Henry Burns and Vitaly Wool

   - more accurate reclaimed slab caches calculations by Yafang Shao

   - fix MAP_UNINITIALIZED UAPI symbol to not depend on config, by
     Christoph Hellwig

   - !CONFIG_MMU fixes by Christoph Hellwig

   - new novmcoredd parameter to omit device dumps from vmcore, by
     Kairui Song

   - new test_meminit module for testing heap and pagealloc
     initialization, by Alexander Potapenko

   - ioremap improvements for huge mappings, by Anshuman Khandual

   - generalize kprobe page fault handling, by Anshuman Khandual

   - device-dax hotplug fixes and improvements, by Pavel Tatashin

   - enable synchronous DAX fault on powerpc, by Aneesh Kumar K.V

   - add pte_devmap() support for arm64, by Robin Murphy

   - unify locked_vm accounting with a helper, by Daniel Jordan

   - several misc fixes

  core/lib:
   - new typeof_member() macro including some users, by Alexey Dobriyan

   - make BIT() and GENMASK() available in asm, by Masahiro Yamada

   - changed LIST_POISON2 on x86_64 to 0xdead000000000122 for better
     code generation, by Alexey Dobriyan

   - rbtree code size optimizations, by Michel Lespinasse

   - convert struct pid count to refcount_t, by Joel Fernandes

  get_maintainer.pl:
   - add --no-moderated switch to skip moderated ML's, by Joe Perches

  misc:
   - ptrace PTRACE_GET_SYSCALL_INFO interface

   - coda updates

   - gdb scripts, various"

[ Using merge message suggestion from Vlastimil Babka, with some editing - Linus ]

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (100 commits)
  fs/select.c: use struct_size() in kmalloc()
  mm: add account_locked_vm utility function
  arm64: mm: implement pte_devmap support
  mm: introduce ARCH_HAS_PTE_DEVMAP
  mm: clean up is_device_*_page() definitions
  mm/mmap: move common defines to mman-common.h
  mm: move MAP_SYNC to asm-generic/mman-common.h
  device-dax: "Hotremove" persistent memory that is used like normal RAM
  mm/hotplug: make remove_memory() interface usable
  device-dax: fix memory and resource leak if hotplug fails
  include/linux/lz4.h: fix spelling and copy-paste errors in documentation
  ipc/mqueue.c: only perform resource calculation if user valid
  include/asm-generic/bug.h: fix "cut here" for WARN_ON for __WARN_TAINT architectures
  scripts/gdb: add helpers to find and list devices
  scripts/gdb: add lx-genpd-summary command
  drivers/pps/pps.c: clear offset flags in PPS_SETPARAMS ioctl
  kernel/pid.c: convert struct pid count to refcount_t
  drivers/rapidio/devices/rio_mport_cdev.c: NUL terminate some strings
  select: shift restore_saved_sigmask_unless() into poll_select_copy_remaining()
  select: change do_poll() to return -ERESTARTNOHAND rather than -EINTR
  ...

1 files changed, 8 insertions, 12 deletions

diff --git a/fs/aio.c b/fs/aio.c
index 2d405733a8c6..8327db0c8e08 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -2094,7 +2094,6 @@ SYSCALL_DEFINE6(io_pgetevents,
                 const struct __aio_sigset __user *, usig)
 {
         struct __aio_sigset     ksig = { NULL, };
-        sigset_t                ksigmask, sigsaved;
         struct timespec64       ts;
         bool interrupted;
         int ret;
@@ -2105,14 +2104,14 @@ SYSCALL_DEFINE6(io_pgetevents,
         if (usig && copy_from_user(&ksig, usig, sizeof(ksig)))
                 return -EFAULT;
 
-        ret = set_user_sigmask(ksig.sigmask, &ksigmask, &sigsaved, ksig.sigsetsize);
+        ret = set_user_sigmask(ksig.sigmask, ksig.sigsetsize);
         if (ret)
                 return ret;
 
         ret = do_io_getevents(ctx_id, min_nr, nr, events, timeout ? &ts : NULL);
 
         interrupted = signal_pending(current);
-        restore_user_sigmask(ksig.sigmask, &sigsaved, interrupted);
+        restore_saved_sigmask_unless(interrupted);
         if (interrupted && !ret)
                 ret = -ERESTARTNOHAND;
 
@@ -2130,7 +2129,6 @@ SYSCALL_DEFINE6(io_pgetevents_time32,
                 const struct __aio_sigset __user *, usig)
 {
         struct __aio_sigset     ksig = { NULL, };
-        sigset_t                ksigmask, sigsaved;
         struct timespec64       ts;
         bool interrupted;
         int ret;
@@ -2142,14 +2140,14 @@ SYSCALL_DEFINE6(io_pgetevents_time32,
                 return -EFAULT;
 
 
-        ret = set_user_sigmask(ksig.sigmask, &ksigmask, &sigsaved, ksig.sigsetsize);
+        ret = set_user_sigmask(ksig.sigmask, ksig.sigsetsize);
         if (ret)
                 return ret;
 
         ret = do_io_getevents(ctx_id, min_nr, nr, events, timeout ? &ts : NULL);
 
         interrupted = signal_pending(current);
-        restore_user_sigmask(ksig.sigmask, &sigsaved, interrupted);
+        restore_saved_sigmask_unless(interrupted);
         if (interrupted && !ret)
                 ret = -ERESTARTNOHAND;
 
@@ -2198,7 +2196,6 @@ COMPAT_SYSCALL_DEFINE6(io_pgetevents,
                 const struct __compat_aio_sigset __user *, usig)
 {
         struct __compat_aio_sigset ksig = { NULL, };
-        sigset_t ksigmask, sigsaved;
         struct timespec64 t;
         bool interrupted;
         int ret;
@@ -2209,14 +2206,14 @@ COMPAT_SYSCALL_DEFINE6(io_pgetevents,
         if (usig && copy_from_user(&ksig, usig, sizeof(ksig)))
                 return -EFAULT;
 
-        ret = set_compat_user_sigmask(ksig.sigmask, &ksigmask, &sigsaved, ksig.sigsetsize);
+        ret = set_compat_user_sigmask(ksig.sigmask, ksig.sigsetsize);
         if (ret)
                 return ret;
 
         ret = do_io_getevents(ctx_id, min_nr, nr, events, timeout ? &t : NULL);
 
         interrupted = signal_pending(current);
-        restore_user_sigmask(ksig.sigmask, &sigsaved, interrupted);
+        restore_saved_sigmask_unless(interrupted);
         if (interrupted && !ret)
                 ret = -ERESTARTNOHAND;
 
@@ -2234,7 +2231,6 @@ COMPAT_SYSCALL_DEFINE6(io_pgetevents_time64,
                 const struct __compat_aio_sigset __user *, usig)
 {
         struct __compat_aio_sigset ksig = { NULL, };
-        sigset_t ksigmask, sigsaved;
         struct timespec64 t;
         bool interrupted;
         int ret;
@@ -2245,14 +2241,14 @@ COMPAT_SYSCALL_DEFINE6(io_pgetevents_time64,
         if (usig && copy_from_user(&ksig, usig, sizeof(ksig)))
                 return -EFAULT;
 
-        ret = set_compat_user_sigmask(ksig.sigmask, &ksigmask, &sigsaved, ksig.sigsetsize);
+        ret = set_compat_user_sigmask(ksig.sigmask, ksig.sigsetsize);
         if (ret)
                 return ret;
 
         ret = do_io_getevents(ctx_id, min_nr, nr, events, timeout ? &t : NULL);
 
         interrupted = signal_pending(current);
-        restore_user_sigmask(ksig.sigmask, &sigsaved, interrupted);
+        restore_saved_sigmask_unless(interrupted);
         if (interrupted && !ret)
                 ret = -ERESTARTNOHAND;