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, 5 insertions, 55 deletions

diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c
index 505b56c6b9b9..b0f96c0e6316 100644
--- a/arch/parisc/mm/init.c
+++ b/arch/parisc/mm/init.c
@@ -214,7 +214,6 @@ static void __init setup_bootmem(void)
         mem_limit_func();       /* check for "mem=" argument */
 
         mem_max = 0;
-        num_physpages = 0;
         for (i = 0; i < npmem_ranges; i++) {
                 unsigned long rsize;
 
@@ -229,10 +228,8 @@ static void __init setup_bootmem(void)
                                 npmem_ranges = i + 1;
                                 mem_max = mem_limit;
                         }
-                num_physpages += pmem_ranges[i].pages;
                         break;
                 }
-            num_physpages += pmem_ranges[i].pages;
                 mem_max += rsize;
         }
 
@@ -532,7 +529,7 @@ void free_initmem(void)
          * pages are no-longer executable */
         flush_icache_range(init_begin, init_end);
         
-        num_physpages += free_initmem_default(0);
+        free_initmem_default(-1);
 
         /* set up a new led state on systems shipped LED State panel */
         pdc_chassis_send_status(PDC_CHASSIS_DIRECT_BCOMPLETE);
@@ -580,8 +577,6 @@ unsigned long pcxl_dma_start __read_mostly;
 
 void __init mem_init(void)
 {
-        int codesize, reservedpages, datasize, initsize;
-
         /* Do sanity checks on page table constants */
         BUILD_BUG_ON(PTE_ENTRY_SIZE != sizeof(pte_t));
         BUILD_BUG_ON(PMD_ENTRY_SIZE != sizeof(pmd_t));
@@ -590,45 +585,8 @@ void __init mem_init(void)
                         > BITS_PER_LONG);
 
         high_memory = __va((max_pfn << PAGE_SHIFT));
-
-#ifndef CONFIG_DISCONTIGMEM
-        max_mapnr = page_to_pfn(virt_to_page(high_memory - 1)) + 1;
-        totalram_pages += free_all_bootmem();
-#else
-        {
-                int i;
-
-                for (i = 0; i < npmem_ranges; i++)
-                        totalram_pages += free_all_bootmem_node(NODE_DATA(i));
-        }
-#endif
-
-        codesize = (unsigned long)_etext - (unsigned long)_text;
-        datasize = (unsigned long)_edata - (unsigned long)_etext;
-        initsize = (unsigned long)__init_end - (unsigned long)__init_begin;
-
-        reservedpages = 0;
-{
-        unsigned long pfn;
-#ifdef CONFIG_DISCONTIGMEM
-        int i;
-
-        for (i = 0; i < npmem_ranges; i++) {
-                for (pfn = node_start_pfn(i); pfn < node_end_pfn(i); pfn++) {
-                        if (PageReserved(pfn_to_page(pfn)))
-                                reservedpages++;
-                }
-        }
-#else /* !CONFIG_DISCONTIGMEM */
-        for (pfn = 0; pfn < max_pfn; pfn++) {
-                /*
-                 * Only count reserved RAM pages
-                 */
-                if (PageReserved(pfn_to_page(pfn)))
-                        reservedpages++;
-        }
-#endif
-}
+        set_max_mapnr(page_to_pfn(virt_to_page(high_memory - 1)) + 1);
+        free_all_bootmem();
 
 #ifdef CONFIG_PA11
         if (hppa_dma_ops == &pcxl_dma_ops) {
@@ -643,15 +601,7 @@ void __init mem_init(void)
         parisc_vmalloc_start = SET_MAP_OFFSET(MAP_START);
 #endif
 
-        printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, %dk reserved, %dk data, %dk init)\n",
-                nr_free_pages() << (PAGE_SHIFT-10),
-                num_physpages << (PAGE_SHIFT-10),
-                codesize >> 10,
-                reservedpages << (PAGE_SHIFT-10),
-                datasize >> 10,
-                initsize >> 10
-        );
-
+        mem_init_print_info(NULL);
 #ifdef CONFIG_DEBUG_KERNEL /* double-sanity-check paranoia */
         printk("virtual kernel memory layout:\n"
                "    vmalloc : 0x%p - 0x%p   (%4ld MB)\n"
@@ -1101,6 +1051,6 @@ void flush_tlb_all(void)
 #ifdef CONFIG_BLK_DEV_INITRD
 void free_initrd_mem(unsigned long start, unsigned long end)
 {
-        num_physpages += free_reserved_area(start, end, 0, "initrd");
+        free_reserved_area((void *)start, (void *)end, -1, "initrd");
 }
 #endif