Merge branch 'akpm' (incoming from Andrew Morton)

Merge fixes from Andrew Morton:
 "A bunch of fixes and one simple fbdev driver which missed the merge
  window because people will still talking about it (to no great
  effect)."

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (30 commits)
  aio: fix kioctx not being freed after cancellation at exit time
  mm/pagewalk.c: walk_page_range should avoid VM_PFNMAP areas
  drivers/rtc/rtc-max8998.c: check for pdata presence before dereferencing
  ocfs2: goto out_unlock if ocfs2_get_clusters_nocache() failed in ocfs2_fiemap()
  random: fix accounting race condition with lockless irq entropy_count update
  drivers/char/random.c: fix priming of last_data
  mm/memory_hotplug.c: fix printk format warnings
  nilfs2: fix issue of nilfs_set_page_dirty() for page at EOF boundary
  drivers/block/brd.c: fix brd_lookup_page() race
  fbdev: FB_GOLDFISH should depend on HAS_DMA
  drivers/rtc/rtc-pl031.c: pass correct pointer to free_irq()
  auditfilter.c: fix kernel-doc warnings
  aio: fix io_getevents documentation
  revert "selftest: add simple test for soft-dirty bit"
  drivers/leds/leds-ot200.c: fix error caused by shifted mask
  mm/THP: use pmd_populate() to update the pmd with pgtable_t pointer
  linux/kernel.h: fix kernel-doc warning
  mm compaction: fix of improper cache flush in migration code
  rapidio/tsi721: fix bug in MSI interrupt handling
  hfs: avoid crash in hfs_bnode_create
  ...

3 files changed, 0 insertions, 125 deletions

diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile
index d4abc59ce1d9..0a63658065f0 100644
--- a/tools/testing/selftests/Makefile
+++ b/tools/testing/selftests/Makefile
@@ -6,7 +6,6 @@ TARGETS += memory-hotplug
 TARGETS += mqueue
 TARGETS += net
 TARGETS += ptrace
-TARGETS += soft-dirty
 TARGETS += vm
 
 all:
diff --git a/tools/testing/selftests/soft-dirty/Makefile b/tools/testing/selftests/soft-dirty/Makefile
deleted file mode 100644
index a9cdc823d6e0..000000000000
--- a/tools/testing/selftests/soft-dirty/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-CFLAGS += -iquote../../../../include/uapi -Wall
-soft-dirty: soft-dirty.c
-
-all: soft-dirty
-
-clean:
-        rm -f soft-dirty
-
-run_tests: all
-        @./soft-dirty || echo "soft-dirty selftests: [FAIL]"
diff --git a/tools/testing/selftests/soft-dirty/soft-dirty.c b/tools/testing/selftests/soft-dirty/soft-dirty.c
deleted file mode 100644
index aba4f87f87f0..000000000000
--- a/tools/testing/selftests/soft-dirty/soft-dirty.c
+++ /dev/null
@@ -1,114 +0,0 @@
-#include <stdlib.h>
-#include <stdio.h>
-#include <sys/mman.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/types.h>
-
-typedef unsigned long long u64;
-
-#define PME_PRESENT     (1ULL << 63)
-#define PME_SOFT_DIRTY  (1Ull << 55)
-
-#define PAGES_TO_TEST   3
-#ifndef PAGE_SIZE
-#define PAGE_SIZE       4096
-#endif
-
-static void get_pagemap2(char *mem, u64 *map)
-{
-        int fd;
-
-        fd = open("/proc/self/pagemap2", O_RDONLY);
-        if (fd < 0) {
-                perror("Can't open pagemap2");
-                exit(1);
-        }
-
-        lseek(fd, (unsigned long)mem / PAGE_SIZE * sizeof(u64), SEEK_SET);
-        read(fd, map, sizeof(u64) * PAGES_TO_TEST);
-        close(fd);
-}
-
-static inline char map_p(u64 map)
-{
-        return map & PME_PRESENT ? 'p' : '-';
-}
-
-static inline char map_sd(u64 map)
-{
-        return map & PME_SOFT_DIRTY ? 'd' : '-';
-}
-
-static int check_pte(int step, int page, u64 *map, u64 want)
-{
-        if ((map[page] & want) != want) {
-                printf("Step %d Page %d has %c%c, want %c%c\n",
-                                step, page,
-                                map_p(map[page]), map_sd(map[page]),
-                                map_p(want), map_sd(want));
-                return 1;
-        }
-
-        return 0;
-}
-
-static void clear_refs(void)
-{
-        int fd;
-        char *v = "4";
-
-        fd = open("/proc/self/clear_refs", O_WRONLY);
-        if (write(fd, v, 3) < 3) {
-                perror("Can't clear soft-dirty bit");
-                exit(1);
-        }
-        close(fd);
-}
-
-int main(void)
-{
-        char *mem, x;
-        u64 map[PAGES_TO_TEST];
-
-        mem = mmap(NULL, PAGES_TO_TEST * PAGE_SIZE,
-                        PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, 0, 0);
-
-        x = mem[0];
-        mem[2 * PAGE_SIZE] = 'c';
-        get_pagemap2(mem, map);
-
-        if (check_pte(1, 0, map, PME_PRESENT))
-                return 1;
-        if (check_pte(1, 1, map, 0))
-                return 1;
-        if (check_pte(1, 2, map, PME_PRESENT | PME_SOFT_DIRTY))
-                return 1;
-
-        clear_refs();
-        get_pagemap2(mem, map);
-
-        if (check_pte(2, 0, map, PME_PRESENT))
-                return 1;
-        if (check_pte(2, 1, map, 0))
-                return 1;
-        if (check_pte(2, 2, map, PME_PRESENT))
-                return 1;
-
-        mem[0] = 'a';
-        mem[PAGE_SIZE] = 'b';
-        x = mem[2 * PAGE_SIZE];
-        get_pagemap2(mem, map);
-
-        if (check_pte(3, 0, map, PME_PRESENT | PME_SOFT_DIRTY))
-                return 1;
-        if (check_pte(3, 1, map, PME_PRESENT | PME_SOFT_DIRTY))
-                return 1;
-        if (check_pte(3, 2, map, PME_PRESENT))
-                return 1;
-
-        (void)x; /* gcc warn */
-
-        printf("PASS\n");
-        return 0;
-}