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, 20 insertions, 20 deletions

diff --git a/arch/s390/include/asm/setup.h b/arch/s390/include/asm/setup.h
index 925889d360c1..82deb8fc8319 100644
--- a/arch/s390/include/asm/setup.h
+++ b/arch/s390/include/asm/setup.h
@@ -6,7 +6,7 @@
 #ifndef _ASM_S390_SETUP_H
 #define _ASM_S390_SETUP_H
 
-#include <linux/const.h>
+#include <linux/bits.h>
 #include <uapi/asm/setup.h>
 
 #define EP_OFFSET               0x10008
@@ -21,25 +21,25 @@
  * Machine features detected in early.c
  */
 
-#define MACHINE_FLAG_VM         _BITUL(0)
-#define MACHINE_FLAG_KVM        _BITUL(1)
-#define MACHINE_FLAG_LPAR       _BITUL(2)
-#define MACHINE_FLAG_DIAG9C     _BITUL(3)
-#define MACHINE_FLAG_ESOP       _BITUL(4)
-#define MACHINE_FLAG_IDTE       _BITUL(5)
-#define MACHINE_FLAG_DIAG44     _BITUL(6)
-#define MACHINE_FLAG_EDAT1      _BITUL(7)
-#define MACHINE_FLAG_EDAT2      _BITUL(8)
-#define MACHINE_FLAG_TOPOLOGY   _BITUL(10)
-#define MACHINE_FLAG_TE         _BITUL(11)
-#define MACHINE_FLAG_TLB_LC     _BITUL(12)
-#define MACHINE_FLAG_VX         _BITUL(13)
-#define MACHINE_FLAG_TLB_GUEST  _BITUL(14)
-#define MACHINE_FLAG_NX         _BITUL(15)
-#define MACHINE_FLAG_GS         _BITUL(16)
-#define MACHINE_FLAG_SCC        _BITUL(17)
-
-#define LPP_MAGIC               _BITUL(31)
+#define MACHINE_FLAG_VM         BIT(0)
+#define MACHINE_FLAG_KVM        BIT(1)
+#define MACHINE_FLAG_LPAR       BIT(2)
+#define MACHINE_FLAG_DIAG9C     BIT(3)
+#define MACHINE_FLAG_ESOP       BIT(4)
+#define MACHINE_FLAG_IDTE       BIT(5)
+#define MACHINE_FLAG_DIAG44     BIT(6)
+#define MACHINE_FLAG_EDAT1      BIT(7)
+#define MACHINE_FLAG_EDAT2      BIT(8)
+#define MACHINE_FLAG_TOPOLOGY   BIT(10)
+#define MACHINE_FLAG_TE         BIT(11)
+#define MACHINE_FLAG_TLB_LC     BIT(12)
+#define MACHINE_FLAG_VX         BIT(13)
+#define MACHINE_FLAG_TLB_GUEST  BIT(14)
+#define MACHINE_FLAG_NX         BIT(15)
+#define MACHINE_FLAG_GS         BIT(16)
+#define MACHINE_FLAG_SCC        BIT(17)
+
+#define LPP_MAGIC               BIT(31)
 #define LPP_PID_MASK            _AC(0xffffffff, UL)
 
 /* Offsets to entry points in kernel/head.S  */