mm/unicore32: use common help functions to free reserved pages

Use common help functions to free reserved pages.

Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/unicore32/mm/init.c b/arch/unicore32/mm/init.c
index 644482882bae849d92810cfbf3344a3b35775067..63df12d71ce386247971161ce4d070a089731ed1 100644 (file)
--- a/arch/unicore32/mm/init.c
+++ b/arch/unicore32/mm/init.c
@@ -316,24 +316,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;
-}
-
 static inline void
 free_memmap(unsigned long start_pfn, unsigned long end_pfn)
 {
@@ -407,9 +389,9 @@ void __init mem_init(void)
 
        max_mapnr   = pfn_to_page(max_pfn + PHYS_PFN_OFFSET) - mem_map;
 
-       /* this will put all unused low memory onto the freelists */
        free_unused_memmap(&meminfo);
 
+       /* this will put all unused low memory onto the freelists */
        totalram_pages += free_all_bootmem();
 
        reserved_pages = free_pages = 0;
@@ -494,9 +476,7 @@ void __init mem_init(void)
 
 void free_initmem(void)
 {
-       totalram_pages += free_area(__phys_to_pfn(__pa(__init_begin)),
-                                   __phys_to_pfn(__pa(__init_end)),
-                                   "init");
+       free_initmem_default(0);
 }
 
 #ifdef CONFIG_BLK_DEV_INITRD
@@ -506,9 +486,7 @@ static int keep_initrd;
 void free_initrd_mem(unsigned long start, unsigned long end)
 {
        if (!keep_initrd)
-               totalram_pages += free_area(__phys_to_pfn(__pa(start)),
-                                           __phys_to_pfn(__pa(end)),
-                                           "initrd");
+               free_reserved_area(start, end, 0, "initrd");
 }
 
 static int __init keepinitrd_setup(char *__unused)