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

2 files changed, 6 insertions, 26 deletions

diff --git a/arch/score/kernel/vmlinux.lds.S b/arch/score/kernel/vmlinux.lds.S
index eebcbaa4e978..7274b5c4287e 100644
--- a/arch/score/kernel/vmlinux.lds.S
+++ b/arch/score/kernel/vmlinux.lds.S
@@ -49,6 +49,7 @@ SECTIONS
         }
 
         . = ALIGN(16);
+        _sdata =  .;                    /* Start of data section */
         RODATA
 
         EXCEPTION_TABLE(16)
diff --git a/arch/score/mm/init.c b/arch/score/mm/init.c
index 0940682ab38b..9fbce49ad3bd 100644
--- a/arch/score/mm/init.c
+++ b/arch/score/mm/init.c
@@ -75,40 +75,19 @@ void __init paging_init(void)
 
 void __init mem_init(void)
 {
-        unsigned long codesize, reservedpages, datasize, initsize;
-        unsigned long tmp, ram = 0;
-
         high_memory = (void *) __va(max_low_pfn << PAGE_SHIFT);
-        totalram_pages += free_all_bootmem();
+        free_all_bootmem();
         setup_zero_page();      /* Setup zeroed pages. */
-        reservedpages = 0;
-
-        for (tmp = 0; tmp < max_low_pfn; tmp++)
-                if (page_is_ram(tmp)) {
-                        ram++;
-                        if (PageReserved(pfn_to_page(tmp)))
-                                reservedpages++;
-                }
-
-        num_physpages = ram;
-        codesize = (unsigned long) &_etext - (unsigned long) &_text;
-        datasize = (unsigned long) &_edata - (unsigned long) &_etext;
-        initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin;
-
-        printk(KERN_INFO "Memory: %luk/%luk available (%ldk kernel code, "
-                        "%ldk reserved, %ldk data, %ldk init, %ldk highmem)\n",
-                        (unsigned long) nr_free_pages() << (PAGE_SHIFT-10),
-                        ram << (PAGE_SHIFT-10), codesize >> 10,
-                        reservedpages << (PAGE_SHIFT-10), datasize >> 10,
-                        initsize >> 10,
-                        totalhigh_pages << (PAGE_SHIFT-10));
+
+        mem_init_print_info(NULL);
 }
 #endif /* !CONFIG_NEED_MULTIPLE_NODES */
 
 #ifdef CONFIG_BLK_DEV_INITRD
 void free_initrd_mem(unsigned long start, unsigned long end)
 {
-        free_reserved_area(start, end, POISON_FREE_INITMEM, "initrd");
+        free_reserved_area((void *)start, (void *)end, POISON_FREE_INITMEM,
+                           "initrd");
 }
 #endif