1 files changed, 17 insertions, 33 deletions
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index ad722f1208a5..9a5cdc01fcdf 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -99,6 +99,9 @@ void show_mem(unsigned int filter)
        printk("Mem-info:\n");
        show_free_areas(filter);
+        if (filter & SHOW_MEM_FILTER_PAGE_COUNT)
+                return;
        for_each_bank (i, mi) {
                struct membank *bank = &mi->bank[i];
                unsigned int pfn1, pfn2;
@@ -424,24 +427,6 @@ void __init bootmem_init(void)
        max_pfn = max_high - PHYS_PFN_OFFSET;
 }
-static inline int free_area(unsigned long pfn, unsigned long end, char *s)
-{
-        unsigned int pages = 0, size = (end - pfn) << (PAGE_SHIFT - 10);
-        for (; pfn < end; pfn++) {
-                struct page *page = pfn_to_page(pfn);
-                ClearPageReserved(page);
-                init_page_count(page);
-                __free_page(page);
-                pages++;
-        }
-        if (size && s)
-                printk(KERN_INFO "Freeing %s memory: %dK\n", s, size);
-        return pages;
-}
 /*
 * Poison init memory with an undefined instruction (ARM) or a branch to an
 * undefined instruction (Thumb).
@@ -534,6 +519,14 @@ static void __init free_unused_memmap(struct meminfo *mi)
 #endif
 }
+#ifdef CONFIG_HIGHMEM
+static inline void free_area_high(unsigned long pfn, unsigned long end)
+{
+        for (; pfn < end; pfn++)
+                free_highmem_page(pfn_to_page(pfn));
+}
+#endif
 static void __init free_highpages(void)
 {
 #ifdef CONFIG_HIGHMEM
@@ -569,8 +562,7 @@ static void __init free_highpages(void)
                        if (res_end > end)
                                res_end = end;
                        if (res_start != start)
-                                totalhigh_pages += free_area(start, res_start,
+                                free_area_high(start, res_start);
-                                                             NULL);
                        start = res_end;
                        if (start == end)
                                break;
@@ -578,9 +570,8 @@ static void __init free_highpages(void)
                /* And now free anything which remains */
                if (start < end)
-                        totalhigh_pages += free_area(start, end, NULL);
+                        free_area_high(start, end);
        }
-        totalram_pages += totalhigh_pages;
 #endif
 }
@@ -609,8 +600,7 @@ void __init mem_init(void)
 #ifdef CONFIG_SA1111
        /* now that our DMA memory is actually so designated, we can free it */
-        totalram_pages += free_area(PHYS_PFN_OFFSET,
+        free_reserved_area(__va(PHYS_PFN_OFFSET), swapper_pg_dir, 0, NULL);
-                                    __phys_to_pfn(__pa(swapper_pg_dir)), NULL);
 #endif
        free_highpages();
@@ -738,16 +728,12 @@ void free_initmem(void)
        extern char __tcm_start, __tcm_end;
        poison_init_mem(&__tcm_start, &__tcm_end - &__tcm_start);
-        totalram_pages += free_area(__phys_to_pfn(__pa(&__tcm_start)),
+        free_reserved_area(&__tcm_start, &__tcm_end, 0, "TCM link");
-                                    __phys_to_pfn(__pa(&__tcm_end)),
-                                    "TCM link");
 #endif
        poison_init_mem(__init_begin, __init_end - __init_begin);
        if (!machine_is_integrator() && !machine_is_cintegrator())
-                totalram_pages += free_area(__phys_to_pfn(__pa(__init_begin)),
+                free_initmem_default(0);
-                                            __phys_to_pfn(__pa(__init_end)),
-                                            "init");
 }
 #ifdef CONFIG_BLK_DEV_INITRD
@@ -758,9 +744,7 @@ void free_initrd_mem(unsigned long start, unsigned long end)
 {
        if (!keep_initrd) {
                poison_init_mem((void *)start, PAGE_ALIGN(end) - start);
-                totalram_pages += free_area(__phys_to_pfn(__pa(start)),
+                free_reserved_area(start, end, 0, "initrd");
-                                            __phys_to_pfn(__pa(end)),
-                                            "initrd");
        }
 }