Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[~andy/linux] / arch / sh / mm / init.c

diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c
index 105794037143ee8f2c4b15748c6febd19c543ad9..20f9ead650d3e27c20d6f37e87a639288729b22d 100644 (file)
--- a/arch/sh/mm/init.c
+++ b/arch/sh/mm/init.c
@@ -417,15 +417,13 @@ void __init mem_init(void)
 
        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)
-                       node_pages = free_all_bootmem_node(pgdat);
+                       totalram_pages += free_all_bootmem_node(pgdat);
 
-               totalram_pages += node_pages;
 
                node_high_memory = (void *)__va((pgdat->node_start_pfn +
                                                 pgdat->node_spanned_pages) <<
@@ -501,31 +499,13 @@ void __init mem_init(void)
 
 void free_initmem(void)
 {
-       unsigned long addr;
-
-       addr = (unsigned long)(&__init_begin);
-       for (; addr < (unsigned long)(&__init_end); addr += PAGE_SIZE) {
-               ClearPageReserved(virt_to_page(addr));
-               init_page_count(virt_to_page(addr));
-               free_page(addr);
-               totalram_pages++;
-       }
-       printk("Freeing unused kernel memory: %ldk freed\n",
-              ((unsigned long)&__init_end -
-               (unsigned long)&__init_begin) >> 10);
+       free_initmem_default(0);
 }
 
 #ifdef CONFIG_BLK_DEV_INITRD
 void free_initrd_mem(unsigned long start, unsigned long end)
 {
-       unsigned long p;
-       for (p = start; p < end; p += PAGE_SIZE) {
-               ClearPageReserved(virt_to_page(p));
-               init_page_count(virt_to_page(p));
-               free_page(p);
-               totalram_pages++;
-       }
-       printk("Freeing initrd memory: %ldk freed\n", (end - start) >> 10);
+       free_reserved_area(start, end, 0, "initrd");
 }
 #endif