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
  ...

4 files changed, 5 insertions, 55 deletions

diff --git a/arch/ia64/kernel/efi.c b/arch/ia64/kernel/efi.c
index f034563aeae5..51bce594eb83 100644
--- a/arch/ia64/kernel/efi.c
+++ b/arch/ia64/kernel/efi.c
@@ -1116,11 +1116,6 @@ efi_memmap_init(u64 *s, u64 *e)
                 if (!is_memory_available(md))
                         continue;
 
-#ifdef CONFIG_CRASH_DUMP
-                /* saved_max_pfn should ignore max_addr= command line arg */
-                if (saved_max_pfn < (efi_md_end(md) >> PAGE_SHIFT))
-                        saved_max_pfn = (efi_md_end(md) >> PAGE_SHIFT);
-#endif
                 /*
                  * Round ends inward to granule boundaries
                  * Give trimmings to uncached allocator
diff --git a/arch/ia64/mm/contig.c b/arch/ia64/mm/contig.c
index 142c3b785944..da5237d636d6 100644
--- a/arch/ia64/mm/contig.c
+++ b/arch/ia64/mm/contig.c
@@ -294,14 +294,6 @@ find_memory (void)
         alloc_per_cpu_data();
 }
 
-static int count_pages(u64 start, u64 end, void *arg)
-{
-        unsigned long *count = arg;
-
-        *count += (end - start) >> PAGE_SHIFT;
-        return 0;
-}
-
 /*
  * Set up the page tables.
  */
@@ -312,9 +304,6 @@ paging_init (void)
         unsigned long max_dma;
         unsigned long max_zone_pfns[MAX_NR_ZONES];
 
-        num_physpages = 0;
-        efi_memmap_walk(count_pages, &num_physpages);
-
         memset(max_zone_pfns, 0, sizeof(max_zone_pfns));
 #ifdef CONFIG_ZONE_DMA
         max_dma = virt_to_phys((void *) MAX_DMA_ADDRESS) >> PAGE_SHIFT;
diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c
index 7253d83650bf..2de08f4d9930 100644
--- a/arch/ia64/mm/discontig.c
+++ b/arch/ia64/mm/discontig.c
@@ -37,7 +37,6 @@ struct early_node_data {
         struct ia64_node_data *node_data;
         unsigned long pernode_addr;
         unsigned long pernode_size;
-        unsigned long num_physpages;
 #ifdef CONFIG_ZONE_DMA
         unsigned long num_dma_physpages;
 #endif
@@ -732,7 +731,6 @@ static __init int count_node_pages(unsigned long start, unsigned long len, int n
 {
         unsigned long end = start + len;
 
-        mem_data[node].num_physpages += len >> PAGE_SHIFT;
 #ifdef CONFIG_ZONE_DMA
         if (start <= __pa(MAX_DMA_ADDRESS))
                 mem_data[node].num_dma_physpages +=
@@ -778,7 +776,6 @@ void __init paging_init(void)
 #endif
 
         for_each_online_node(node) {
-                num_physpages += mem_data[node].num_physpages;
                 pfn_offset = mem_data[node].min_pfn;
 
 #ifdef CONFIG_VIRTUAL_MEM_MAP
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
index d1fe4b402601..b6f7f43424ec 100644
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c
@@ -154,9 +154,8 @@ ia64_init_addr_space (void)
 void
 free_initmem (void)
 {
-        free_reserved_area((unsigned long)ia64_imva(__init_begin),
-                           (unsigned long)ia64_imva(__init_end),
-                           0, "unused kernel");
+        free_reserved_area(ia64_imva(__init_begin), ia64_imva(__init_end),
+                           -1, "unused kernel");
 }
 
 void __init
@@ -546,19 +545,6 @@ int __init register_active_ranges(u64 start, u64 len, int nid)
         return 0;
 }
 
-static int __init
-count_reserved_pages(u64 start, u64 end, void *arg)
-{
-        unsigned long num_reserved = 0;
-        unsigned long *count = arg;
-
-        for (; start < end; start += PAGE_SIZE)
-                if (PageReserved(virt_to_page(start)))
-                        ++num_reserved;
-        *count += num_reserved;
-        return 0;
-}
-
 int
 find_max_min_low_pfn (u64 start, u64 end, void *arg)
 {
@@ -597,8 +583,6 @@ __setup("nolwsys", nolwsys_setup);
 void __init
 mem_init (void)
 {
-        long reserved_pages, codesize, datasize, initsize;
-        pg_data_t *pgdat;
         int i;
 
         BUG_ON(PTRS_PER_PGD * sizeof(pgd_t) != PAGE_SIZE);
@@ -616,27 +600,12 @@ mem_init (void)
 
 #ifdef CONFIG_FLATMEM
         BUG_ON(!mem_map);
-        max_mapnr = max_low_pfn;
 #endif
 
+        set_max_mapnr(max_low_pfn);
         high_memory = __va(max_low_pfn * PAGE_SIZE);
-
-        for_each_online_pgdat(pgdat)
-                if (pgdat->bdata->node_bootmem_map)
-                        totalram_pages += free_all_bootmem_node(pgdat);
-
-        reserved_pages = 0;
-        efi_memmap_walk(count_reserved_pages, &reserved_pages);
-
-        codesize =  (unsigned long) _etext - (unsigned long) _stext;
-        datasize =  (unsigned long) _edata - (unsigned long) _etext;
-        initsize =  (unsigned long) __init_end - (unsigned long) __init_begin;
-
-        printk(KERN_INFO "Memory: %luk/%luk available (%luk code, %luk reserved, "
-               "%luk data, %luk init)\n", nr_free_pages() << (PAGE_SHIFT - 10),
-               num_physpages << (PAGE_SHIFT - 10), codesize >> 10,
-               reserved_pages << (PAGE_SHIFT - 10), datasize >> 10, initsize >> 10);
-
+        free_all_bootmem();
+        mem_init_print_info(NULL);
 
         /*
          * For fsyscall entrpoints with no light-weight handler, use the ordinary