Merge branch 'akpm' (updates from Andrew Morton)

Merge first patch-bomb from Andrew Morton:
 - various misc bits
 - I'm been patchmonkeying ocfs2 for a while, as Joel and Mark have been
   distracted.  There has been quite a bit of activity.
 - About half the MM queue
 - Some backlight bits
 - Various lib/ updates
 - checkpatch updates
 - zillions more little rtc patches
 - ptrace
 - signals
 - exec
 - procfs
 - rapidio
 - nbd
 - aoe
 - pps
 - memstick
 - tools/testing/selftests updates

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (445 commits)
  tools/testing/selftests: don't assume the x bit is set on scripts
  selftests: add .gitignore for kcmp
  selftests: fix clean target in kcmp Makefile
  selftests: add .gitignore for vm
  selftests: add hugetlbfstest
  self-test: fix make clean
  selftests: exit 1 on failure
  kernel/resource.c: remove the unneeded assignment in function __find_resource
  aio: fix wrong comment in aio_complete()
  drivers/w1/slaves/w1_ds2408.c: add magic sequence to disable P0 test mode
  drivers/memstick/host/r592.c: convert to module_pci_driver
  drivers/memstick/host/jmb38x_ms: convert to module_pci_driver
  pps-gpio: add device-tree binding and support
  drivers/pps/clients/pps-gpio.c: convert to module_platform_driver
  drivers/pps/clients/pps-gpio.c: convert to devm_* helpers
  drivers/parport/share.c: use kzalloc
  Documentation/accounting/getdelays.c: avoid strncpy in accounting tool
  aoe: update internal version number to v83
  aoe: update copyright date
  aoe: perform I/O completions in parallel
  ...

1 files changed, 6 insertions, 36 deletions

diff --git a/arch/arc/mm/init.c b/arch/arc/mm/init.c
index 4a177365b2c4..a08ce7185423 100644
--- a/arch/arc/mm/init.c
+++ b/arch/arc/mm/init.c
@@ -74,7 +74,7 @@ void __init setup_arch_memory(void)
         /* Last usable page of low mem (no HIGHMEM yet for ARC port) */
         max_low_pfn = max_pfn = PFN_DOWN(end_mem);
 
-        max_mapnr = num_physpages = max_low_pfn - min_low_pfn;
+        max_mapnr = max_low_pfn - min_low_pfn;
 
         /*------------- reserve kernel image -----------------------*/
         memblock_reserve(CONFIG_LINUX_LINK_BASE,
@@ -84,7 +84,7 @@ void __init setup_arch_memory(void)
 
         /*-------------- node setup --------------------------------*/
         memset(zones_size, 0, sizeof(zones_size));
-        zones_size[ZONE_NORMAL] = num_physpages;
+        zones_size[ZONE_NORMAL] = max_low_pfn - min_low_pfn;
 
         /*
          * We can't use the helper free_area_init(zones[]) because it uses
@@ -106,39 +106,9 @@ void __init setup_arch_memory(void)
  */
 void __init mem_init(void)
 {
-        int codesize, datasize, initsize, reserved_pages, free_pages;
-        int tmp;
-
         high_memory = (void *)(CONFIG_LINUX_LINK_BASE + arc_mem_sz);
-
-        totalram_pages = free_all_bootmem();
-
-        /* count all reserved pages [kernel code/data/mem_map..] */
-        reserved_pages = 0;
-        for (tmp = 0; tmp < max_mapnr; tmp++)
-                if (PageReserved(mem_map + tmp))
-                        reserved_pages++;
-
-        /* XXX: nr_free_pages() is equivalent */
-        free_pages = max_mapnr - reserved_pages;
-
-        /*
-         * For the purpose of display below, split the "reserve mem"
-         * kernel code/data is already shown explicitly,
-         * Show any other reservations (mem_map[ ] et al)
-         */
-        reserved_pages -= (((unsigned int)_end - CONFIG_LINUX_LINK_BASE) >>
-                                                                PAGE_SHIFT);
-
-        codesize = _etext - _text;
-        datasize = _end - _etext;
-        initsize = __init_end - __init_begin;
-
-        pr_info("Memory Available: %dM / %ldM (%dK code, %dK data, %dK init, %dK reserv)\n",
-                PAGES_TO_MB(free_pages),
-                TO_MB(arc_mem_sz),
-                TO_KB(codesize), TO_KB(datasize), TO_KB(initsize),
-                PAGES_TO_KB(reserved_pages));
+        free_all_bootmem();
+        mem_init_print_info(NULL);
 }
 
 /*
@@ -146,13 +116,13 @@ void __init mem_init(void)
  */
 void __init_refok free_initmem(void)
 {
-        free_initmem_default(0);
+        free_initmem_default(-1);
 }
 
 #ifdef CONFIG_BLK_DEV_INITRD
 void __init free_initrd_mem(unsigned long start, unsigned long end)
 {
-        free_reserved_area(start, end, 0, "initrd");
+        free_reserved_area((void *)start, (void *)end, -1, "initrd");
 }
 #endif