Merge branch 'akpm' (patches from Andrew Morton)

Merge second patch-bomb from Andrew Morton:
 - a few hotfixes
 - drivers/dma updates
 - MAINTAINERS updates
 - Quite a lot of lib/ updates
 - checkpatch updates
 - binfmt updates
 - autofs4
 - drivers/rtc/
 - various small tweaks to less used filesystems
 - ipc/ updates
 - kernel/watchdog.c changes

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (135 commits)
  mm: softdirty: enable write notifications on VMAs after VM_SOFTDIRTY cleared
  kernel/param: consolidate __{start,stop}___param[] in <linux/moduleparam.h>
  ia64: remove duplicate declarations of __per_cpu_start[] and __per_cpu_end[]
  frv: remove unused declarations of __start___ex_table and __stop___ex_table
  kvm: ensure hard lockup detection is disabled by default
  kernel/watchdog.c: control hard lockup detection default
  staging: rtl8192u: use %*pEn to escape buffer
  staging: rtl8192e: use %*pEn to escape buffer
  staging: wlan-ng: use %*pEhp to print SN
  lib80211: remove unused print_ssid()
  wireless: hostap: proc: print properly escaped SSID
  wireless: ipw2x00: print SSID via %*pE
  wireless: libertas: print esaped string via %*pE
  lib/vsprintf: add %*pE[achnops] format specifier
  lib / string_helpers: introduce string_escape_mem()
  lib / string_helpers: refactoring the test suite
  lib / string_helpers: move documentation to c-file
  include/linux: remove strict_strto* definitions
  arch/x86/mm/numa.c: fix boot failure when all nodes are hotpluggable
  fs: check bh blocknr earlier when searching lru
  ...

2 files changed, 61 insertions, 48 deletions

diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
index baff1da354e0..af78e50ca6ce 100644
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
@@ -86,6 +86,7 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr,
         pgprot_t prot;
         int retval;
         void __iomem *ret_addr;
+        int ram_region;
 
         /* Don't allow wraparound or zero size */
         last_addr = phys_addr + size - 1;
@@ -108,12 +109,23 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr,
         /*
          * Don't allow anybody to remap normal RAM that we're using..
          */
-        pfn      = phys_addr >> PAGE_SHIFT;
-        last_pfn = last_addr >> PAGE_SHIFT;
-        if (walk_system_ram_range(pfn, last_pfn - pfn + 1, NULL,
-                                  __ioremap_check_ram) == 1)
+        /* First check if whole region can be identified as RAM or not */
+        ram_region = region_is_ram(phys_addr, size);
+        if (ram_region > 0) {
+                WARN_ONCE(1, "ioremap on RAM at 0x%lx - 0x%lx\n",
+                                (unsigned long int)phys_addr,
+                                (unsigned long int)last_addr);
                 return NULL;
+        }
 
+        /* If could not be identified(-1), check page by page */
+        if (ram_region < 0) {
+                pfn      = phys_addr >> PAGE_SHIFT;
+                last_pfn = last_addr >> PAGE_SHIFT;
+                if (walk_system_ram_range(pfn, last_pfn - pfn + 1, NULL,
+                                          __ioremap_check_ram) == 1)
+                        return NULL;
+        }
         /*
          * Mappings have to be page-aligned
          */
diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
index d221374d5ce8..1a883705a12a 100644
--- a/arch/x86/mm/numa.c
+++ b/arch/x86/mm/numa.c
@@ -463,6 +463,42 @@ static bool __init numa_meminfo_cover_memory(const struct numa_meminfo *mi)
         return true;
 }
 
+static void __init numa_clear_kernel_node_hotplug(void)
+{
+        int i, nid;
+        nodemask_t numa_kernel_nodes = NODE_MASK_NONE;
+        unsigned long start, end;
+        struct memblock_region *r;
+
+        /*
+         * At this time, all memory regions reserved by memblock are
+         * used by the kernel. Set the nid in memblock.reserved will
+         * mark out all the nodes the kernel resides in.
+         */
+        for (i = 0; i < numa_meminfo.nr_blks; i++) {
+                struct numa_memblk *mb = &numa_meminfo.blk[i];
+
+                memblock_set_node(mb->start, mb->end - mb->start,
+                                  &memblock.reserved, mb->nid);
+        }
+
+        /* Mark all kernel nodes. */
+        for_each_memblock(reserved, r)
+                node_set(r->nid, numa_kernel_nodes);
+
+        /* Clear MEMBLOCK_HOTPLUG flag for memory in kernel nodes. */
+        for (i = 0; i < numa_meminfo.nr_blks; i++) {
+                nid = numa_meminfo.blk[i].nid;
+                if (!node_isset(nid, numa_kernel_nodes))
+                        continue;
+
+                start = numa_meminfo.blk[i].start;
+                end = numa_meminfo.blk[i].end;
+
+                memblock_clear_hotplug(start, end - start);
+        }
+}
+
 static int __init numa_register_memblks(struct numa_meminfo *mi)
 {
         unsigned long uninitialized_var(pfn_align);
@@ -481,6 +517,15 @@ static int __init numa_register_memblks(struct numa_meminfo *mi)
         }
 
         /*
+         * At very early time, the kernel have to use some memory such as
+         * loading the kernel image. We cannot prevent this anyway. So any
+         * node the kernel resides in should be un-hotpluggable.
+         *
+         * And when we come here, alloc node data won't fail.
+         */
+        numa_clear_kernel_node_hotplug();
+
+        /*
          * If sections array is gonna be used for pfn -> nid mapping, check
          * whether its granularity is fine enough.
          */
@@ -548,41 +593,6 @@ static void __init numa_init_array(void)
         }
 }
 
-static void __init numa_clear_kernel_node_hotplug(void)
-{
-        int i, nid;
-        nodemask_t numa_kernel_nodes = NODE_MASK_NONE;
-        unsigned long start, end;
-        struct memblock_region *r;
-
-        /*
-         * At this time, all memory regions reserved by memblock are
-         * used by the kernel. Set the nid in memblock.reserved will
-         * mark out all the nodes the kernel resides in.
-         */
-        for (i = 0; i < numa_meminfo.nr_blks; i++) {
-                struct numa_memblk *mb = &numa_meminfo.blk[i];
-                memblock_set_node(mb->start, mb->end - mb->start,
-                                  &memblock.reserved, mb->nid);
-        }
-
-        /* Mark all kernel nodes. */
-        for_each_memblock(reserved, r)
-                node_set(r->nid, numa_kernel_nodes);
-
-        /* Clear MEMBLOCK_HOTPLUG flag for memory in kernel nodes. */
-        for (i = 0; i < numa_meminfo.nr_blks; i++) {
-                nid = numa_meminfo.blk[i].nid;
-                if (!node_isset(nid, numa_kernel_nodes))
-                        continue;
-
-                start = numa_meminfo.blk[i].start;
-                end = numa_meminfo.blk[i].end;
-
-                memblock_clear_hotplug(start, end - start);
-        }
-}
-
 static int __init numa_init(int (*init_func)(void))
 {
         int i;
@@ -637,15 +647,6 @@ static int __init numa_init(int (*init_func)(void))
         }
         numa_init_array();
 
-        /*
-         * At very early time, the kernel have to use some memory such as
-         * loading the kernel image. We cannot prevent this anyway. So any
-         * node the kernel resides in should be un-hotpluggable.
-         *
-         * And when we come here, numa_init() won't fail.
-         */
-        numa_clear_kernel_node_hotplug();
-
         return 0;
 }