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

3 files changed, 12 insertions, 46 deletions

diff --git a/arch/avr32/kernel/setup.c b/arch/avr32/kernel/setup.c
index b4247f478065..209ae5ad3495 100644
--- a/arch/avr32/kernel/setup.c
+++ b/arch/avr32/kernel/setup.c
@@ -555,7 +555,7 @@ void __init setup_arch (char **cmdline_p)
 {
         struct clk *cpu_clk;
 
-        init_mm.start_code = (unsigned long)_text;
+        init_mm.start_code = (unsigned long)_stext;
         init_mm.end_code = (unsigned long)_etext;
         init_mm.end_data = (unsigned long)_edata;
         init_mm.brk = (unsigned long)_end;
diff --git a/arch/avr32/kernel/vmlinux.lds.S b/arch/avr32/kernel/vmlinux.lds.S
index 9cd2bd91d64a..a4589176bed5 100644
--- a/arch/avr32/kernel/vmlinux.lds.S
+++ b/arch/avr32/kernel/vmlinux.lds.S
@@ -23,7 +23,7 @@ SECTIONS
 {
         . = CONFIG_ENTRY_ADDRESS;
         .init           : AT(ADDR(.init) - LOAD_OFFSET) {
-                _stext = .;
+                _text = .;
                 __init_begin = .;
                         _sinittext = .;
                         *(.text.reset)
@@ -46,7 +46,7 @@ SECTIONS
 
         .text           : AT(ADDR(.text) - LOAD_OFFSET) {
                 _evba = .;
-                _text = .;
+                _stext = .;
                 *(.ex.text)
                 *(.irq.text)
                 KPROBES_TEXT
diff --git a/arch/avr32/mm/init.c b/arch/avr32/mm/init.c
index e66e8406f992..def5391d927a 100644
--- a/arch/avr32/mm/init.c
+++ b/arch/avr32/mm/init.c
@@ -100,60 +100,26 @@ void __init paging_init(void)
 
 void __init mem_init(void)
 {
-        int codesize, reservedpages, datasize, initsize;
-        int nid, i;
+        pg_data_t *pgdat;
 
-        reservedpages = 0;
         high_memory = NULL;
+        for_each_online_pgdat(pgdat)
+                high_memory = max_t(void *, high_memory,
+                                    __va(pgdat_end_pfn(pgdat) << PAGE_SHIFT));
 
-        /* this will put all low memory onto the freelists */
-        for_each_online_node(nid) {
-                pg_data_t *pgdat = NODE_DATA(nid);
-                unsigned long node_pages = 0;
-                void *node_high_memory;
-
-                num_physpages += pgdat->node_present_pages;
-
-                if (pgdat->node_spanned_pages != 0)
-                        node_pages = free_all_bootmem_node(pgdat);
-
-                totalram_pages += node_pages;
-
-                for (i = 0; i < node_pages; i++)
-                        if (PageReserved(pgdat->node_mem_map + i))
-                                reservedpages++;
-
-                node_high_memory = (void *)((pgdat->node_start_pfn
-                                             + pgdat->node_spanned_pages)
-                                            << PAGE_SHIFT);
-                if (node_high_memory > high_memory)
-                        high_memory = node_high_memory;
-        }
-
-        max_mapnr = MAP_NR(high_memory);
-
-        codesize = (unsigned long)_etext - (unsigned long)_text;
-        datasize = (unsigned long)_edata - (unsigned long)_data;
-        initsize = (unsigned long)__init_end - (unsigned long)__init_begin;
-
-        printk ("Memory: %luk/%luk available (%dk kernel code, "
-                "%dk reserved, %dk data, %dk init)\n",
-                nr_free_pages() << (PAGE_SHIFT - 10),
-                totalram_pages << (PAGE_SHIFT - 10),
-                codesize >> 10,
-                reservedpages << (PAGE_SHIFT - 10),
-                datasize >> 10,
-                initsize >> 10);
+        set_max_mapnr(MAP_NR(high_memory));
+        free_all_bootmem();
+        mem_init_print_info(NULL);
 }
 
 void free_initmem(void)
 {
-        free_initmem_default(0);
+        free_initmem_default(-1);
 }
 
 #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