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, 42 deletions

diff --git a/arch/openrisc/mm/init.c b/arch/openrisc/mm/init.c
index b3cbc6703837..7f94652311d7 100644
--- a/arch/openrisc/mm/init.c
+++ b/arch/openrisc/mm/init.c
@@ -202,56 +202,20 @@ void __init paging_init(void)
 
 /* References to section boundaries */
 
-static int __init free_pages_init(void)
-{
-        int reservedpages, pfn;
-
-        /* this will put all low memory onto the freelists */
-        totalram_pages = free_all_bootmem();
-
-        reservedpages = 0;
-        for (pfn = 0; pfn < max_low_pfn; pfn++) {
-                /*
-                 * Only count reserved RAM pages
-                 */
-                if (PageReserved(mem_map + pfn))
-                        reservedpages++;
-        }
-
-        return reservedpages;
-}
-
-static void __init set_max_mapnr_init(void)
-{
-        max_mapnr = num_physpages = max_low_pfn;
-}
-
 void __init mem_init(void)
 {
-        int codesize, reservedpages, datasize, initsize;
-
         BUG_ON(!mem_map);
 
-        set_max_mapnr_init();
-
+        max_mapnr = max_low_pfn;
         high_memory = (void *)__va(max_low_pfn * PAGE_SIZE);
 
         /* clear the zero-page */
         memset((void *)empty_zero_page, 0, PAGE_SIZE);
 
-        reservedpages = free_pages_init();
-
-        codesize = (unsigned long)&_etext - (unsigned long)&_stext;
-        datasize = (unsigned long)&_edata - (unsigned long)&_etext;
-        initsize = (unsigned long)&__init_end - (unsigned long)&__init_begin;
+        /* this will put all low memory onto the freelists */
+        free_all_bootmem();
 
-        printk(KERN_INFO
-               "Memory: %luk/%luk available (%dk kernel code, %dk reserved, %dk data, %dk init, %ldk highmem)\n",
-               (unsigned long)nr_free_pages() << (PAGE_SHIFT - 10),
-               max_mapnr << (PAGE_SHIFT - 10), codesize >> 10,
-               reservedpages << (PAGE_SHIFT - 10), datasize >> 10,
-               initsize >> 10, (unsigned long)(0 << (PAGE_SHIFT - 10))
-            );
+        mem_init_print_info(NULL);
 
         printk("mem_init_done ...........................................\n");
         mem_init_done = 1;
@@ -261,11 +225,11 @@ void __init mem_init(void)
 #ifdef CONFIG_BLK_DEV_INITRD
 void 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
 
 void free_initmem(void)
 {
-        free_initmem_default(0);
+        free_initmem_default(-1);
 }