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, 80 insertions, 3 deletions

diff --git a/lib/test_string.c b/lib/test_string.c
index bf8def01ed20..7b31f4a505bf 100644
--- a/lib/test_string.c
+++ b/lib/test_string.c
@@ -36,7 +36,7 @@ static __init int memset16_selftest(void)
 fail:
         kfree(p);
         if (i < 256)
-                return (i << 24) | (j << 16) | k;
+                return (i << 24) | (j << 16) | k | 0x8000;
         return 0;
 }
 
@@ -72,7 +72,7 @@ static __init int memset32_selftest(void)
 fail:
         kfree(p);
         if (i < 256)
-                return (i << 24) | (j << 16) | k;
+                return (i << 24) | (j << 16) | k | 0x8000;
         return 0;
 }
 
@@ -108,7 +108,74 @@ static __init int memset64_selftest(void)
 fail:
         kfree(p);
         if (i < 256)
-                return (i << 24) | (j << 16) | k;
+                return (i << 24) | (j << 16) | k | 0x8000;
+        return 0;
+}
+
+static __init int strchr_selftest(void)
+{
+        const char *test_string = "abcdefghijkl";
+        const char *empty_string = "";
+        char *result;
+        int i;
+
+        for (i = 0; i < strlen(test_string) + 1; i++) {
+                result = strchr(test_string, test_string[i]);
+                if (result - test_string != i)
+                        return i + 'a';
+        }
+
+        result = strchr(empty_string, '\0');
+        if (result != empty_string)
+                return 0x101;
+
+        result = strchr(empty_string, 'a');
+        if (result)
+                return 0x102;
+
+        result = strchr(test_string, 'z');
+        if (result)
+                return 0x103;
+
+        return 0;
+}
+
+static __init int strnchr_selftest(void)
+{
+        const char *test_string = "abcdefghijkl";
+        const char *empty_string = "";
+        char *result;
+        int i, j;
+
+        for (i = 0; i < strlen(test_string) + 1; i++) {
+                for (j = 0; j < strlen(test_string) + 2; j++) {
+                        result = strnchr(test_string, j, test_string[i]);
+                        if (j <= i) {
+                                if (!result)
+                                        continue;
+                                return ((i + 'a') << 8) | j;
+                        }
+                        if (result - test_string != i)
+                                return ((i + 'a') << 8) | j;
+                }
+        }
+
+        result = strnchr(empty_string, 0, '\0');
+        if (result)
+                return 0x10001;
+
+        result = strnchr(empty_string, 1, '\0');
+        if (result != empty_string)
+                return 0x10002;
+
+        result = strnchr(empty_string, 1, 'a');
+        if (result)
+                return 0x10003;
+
+        result = strnchr(NULL, 0, '\0');
+        if (result)
+                return 0x10004;
+
         return 0;
 }
 
@@ -131,6 +198,16 @@ static __init int string_selftest_init(void)
         if (subtest)
                 goto fail;
 
+        test = 4;
+        subtest = strchr_selftest();
+        if (subtest)
+                goto fail;
+
+        test = 5;
+        subtest = strnchr_selftest();
+        if (subtest)
+                goto fail;
+
         pr_info("String selftests succeeded\n");
         return 0;
 fail: