Merge branch 'akpm' (patches from Andrew Morton)

Merge first patch-bomb from Andrew Morton:
 "Quite a lot of other stuff is banked up awaiting further
  next->mainline merging, but this batch contains:

   - Lots of random misc patches
   - OCFS2
   - Most of MM
   - backlight updates
   - lib/ updates
   - printk updates
   - checkpatch updates
   - epoll tweaking
   - rtc updates
   - hfs
   - hfsplus
   - documentation
   - procfs
   - update gcov to gcc-4.7 format
   - IPC"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (269 commits)
  ipc, msg: fix message length check for negative values
  ipc/util.c: remove unnecessary work pending test
  devpts: plug the memory leak in kill_sb
  ./Makefile: export initial ramdisk compression config option
  init/Kconfig: add option to disable kernel compression
  drivers: w1: make w1_slave::flags long to avoid memory corruption
  drivers/w1/masters/ds1wm.cuse dev_get_platdata()
  drivers/memstick/core/ms_block.c: fix unreachable state in h_msb_read_page()
  drivers/memstick/core/mspro_block.c: fix attributes array allocation
  drivers/pps/clients/pps-gpio.c: remove redundant of_match_ptr
  kernel/panic.c: reduce 1 byte usage for print tainted buffer
  gcov: reuse kbasename helper
  kernel/gcov/fs.c: use pr_warn()
  kernel/module.c: use pr_foo()
  gcov: compile specific gcov implementation based on gcc version
  gcov: add support for gcc 4.7 gcov format
  gcov: move gcov structs definitions to a gcc version specific file
  kernel/taskstats.c: return -ENOMEM when alloc memory fails in add_del_listener()
  kernel/taskstats.c: add nla_nest_cancel() for failure processing between nla_nest_start() and nla_nest_end()
  kernel/sysctl_binary.c: use scnprintf() instead of snprintf()
  ...

2 files changed, 114 insertions, 22 deletions

diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index ce32017c5e38..f97130618113 100644
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -53,12 +53,12 @@ __ref void *alloc_low_pages(unsigned int num)
         if ((pgt_buf_end + num) > pgt_buf_top || !can_use_brk_pgt) {
                 unsigned long ret;
                 if (min_pfn_mapped >= max_pfn_mapped)
-                        panic("alloc_low_page: ran out of memory");
+                        panic("alloc_low_pages: ran out of memory");
                 ret = memblock_find_in_range(min_pfn_mapped << PAGE_SHIFT,
                                         max_pfn_mapped << PAGE_SHIFT,
                                         PAGE_SIZE * num , PAGE_SIZE);
                 if (!ret)
-                        panic("alloc_low_page: can not alloc memory");
+                        panic("alloc_low_pages: can not alloc memory");
                 memblock_reserve(ret, PAGE_SIZE * num);
                 pfn = ret >> PAGE_SHIFT;
         } else {
@@ -418,27 +418,27 @@ static unsigned long __init get_new_step_size(unsigned long step_size)
         return step_size << 5;
 }
 
-void __init init_mem_mapping(void)
+/**
+ * memory_map_top_down - Map [map_start, map_end) top down
+ * @map_start: start address of the target memory range
+ * @map_end: end address of the target memory range
+ *
+ * This function will setup direct mapping for memory range
+ * [map_start, map_end) in top-down. That said, the page tables
+ * will be allocated at the end of the memory, and we map the
+ * memory in top-down.
+ */
+static void __init memory_map_top_down(unsigned long map_start,
+                                       unsigned long map_end)
 {
-        unsigned long end, real_end, start, last_start;
+        unsigned long real_end, start, last_start;
         unsigned long step_size;
         unsigned long addr;
         unsigned long mapped_ram_size = 0;
         unsigned long new_mapped_ram_size;
 
-        probe_page_size_mask();
-
-#ifdef CONFIG_X86_64
-        end = max_pfn << PAGE_SHIFT;
-#else
-        end = max_low_pfn << PAGE_SHIFT;
-#endif
-
-        /* the ISA range is always mapped regardless of memory holes */
-        init_memory_mapping(0, ISA_END_ADDRESS);
-
         /* xen has big range in reserved near end of ram, skip it at first.*/
-        addr = memblock_find_in_range(ISA_END_ADDRESS, end, PMD_SIZE, PMD_SIZE);
+        addr = memblock_find_in_range(map_start, map_end, PMD_SIZE, PMD_SIZE);
         real_end = addr + PMD_SIZE;
 
         /* step_size need to be small so pgt_buf from BRK could cover it */
@@ -453,13 +453,13 @@ void __init init_mem_mapping(void)
          * end of RAM in [min_pfn_mapped, max_pfn_mapped) used as new pages
          * for page table.
          */
-        while (last_start > ISA_END_ADDRESS) {
+        while (last_start > map_start) {
                 if (last_start > step_size) {
                         start = round_down(last_start - 1, step_size);
-                        if (start < ISA_END_ADDRESS)
-                                start = ISA_END_ADDRESS;
+                        if (start < map_start)
+                                start = map_start;
                 } else
-                        start = ISA_END_ADDRESS;
+                        start = map_start;
                 new_mapped_ram_size = init_range_memory_mapping(start,
                                                         last_start);
                 last_start = start;
@@ -470,8 +470,89 @@ void __init init_mem_mapping(void)
                 mapped_ram_size += new_mapped_ram_size;
         }
 
-        if (real_end < end)
-                init_range_memory_mapping(real_end, end);
+        if (real_end < map_end)
+                init_range_memory_mapping(real_end, map_end);
+}
+
+/**
+ * memory_map_bottom_up - Map [map_start, map_end) bottom up
+ * @map_start: start address of the target memory range
+ * @map_end: end address of the target memory range
+ *
+ * This function will setup direct mapping for memory range
+ * [map_start, map_end) in bottom-up. Since we have limited the
+ * bottom-up allocation above the kernel, the page tables will
+ * be allocated just above the kernel and we map the memory
+ * in [map_start, map_end) in bottom-up.
+ */
+static void __init memory_map_bottom_up(unsigned long map_start,
+                                        unsigned long map_end)
+{
+        unsigned long next, new_mapped_ram_size, start;
+        unsigned long mapped_ram_size = 0;
+        /* step_size need to be small so pgt_buf from BRK could cover it */
+        unsigned long step_size = PMD_SIZE;
+
+        start = map_start;
+        min_pfn_mapped = start >> PAGE_SHIFT;
+
+        /*
+         * We start from the bottom (@map_start) and go to the top (@map_end).
+         * The memblock_find_in_range() gets us a block of RAM from the
+         * end of RAM in [min_pfn_mapped, max_pfn_mapped) used as new pages
+         * for page table.
+         */
+        while (start < map_end) {
+                if (map_end - start > step_size) {
+                        next = round_up(start + 1, step_size);
+                        if (next > map_end)
+                                next = map_end;
+                } else
+                        next = map_end;
+
+                new_mapped_ram_size = init_range_memory_mapping(start, next);
+                start = next;
+
+                if (new_mapped_ram_size > mapped_ram_size)
+                        step_size = get_new_step_size(step_size);
+                mapped_ram_size += new_mapped_ram_size;
+        }
+}
+
+void __init init_mem_mapping(void)
+{
+        unsigned long end;
+
+        probe_page_size_mask();
+
+#ifdef CONFIG_X86_64
+        end = max_pfn << PAGE_SHIFT;
+#else
+        end = max_low_pfn << PAGE_SHIFT;
+#endif
+
+        /* the ISA range is always mapped regardless of memory holes */
+        init_memory_mapping(0, ISA_END_ADDRESS);
+
+        /*
+         * If the allocation is in bottom-up direction, we setup direct mapping
+         * in bottom-up, otherwise we setup direct mapping in top-down.
+         */
+        if (memblock_bottom_up()) {
+                unsigned long kernel_end = __pa_symbol(_end);
+
+                /*
+                 * we need two separate calls here. This is because we want to
+                 * allocate page tables above the kernel. So we first map
+                 * [kernel_end, end) to make memory above the kernel be mapped
+                 * as soon as possible. And then use page tables allocated above
+                 * the kernel to map [ISA_END_ADDRESS, kernel_end).
+                 */
+                memory_map_bottom_up(kernel_end, end);
+                memory_map_bottom_up(ISA_END_ADDRESS, kernel_end);
+        } else {
+                memory_map_top_down(ISA_END_ADDRESS, end);
+        }
 
 #ifdef CONFIG_X86_64
         if (max_pfn > max_low_pfn) {
diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
index 8bf93bae1f13..24aec58d6afd 100644
--- a/arch/x86/mm/numa.c
+++ b/arch/x86/mm/numa.c
@@ -567,6 +567,17 @@ static int __init numa_init(int (*init_func)(void))
         ret = init_func();
         if (ret < 0)
                 return ret;
+
+        /*
+         * We reset memblock back to the top-down direction
+         * here because if we configured ACPI_NUMA, we have
+         * parsed SRAT in init_func(). It is ok to have the
+         * reset here even if we did't configure ACPI_NUMA
+         * or acpi numa init fails and fallbacks to dummy
+         * numa init.
+         */
+        memblock_set_bottom_up(false);
+
         ret = numa_cleanup_meminfo(&numa_meminfo);
         if (ret < 0)
                 return ret;