mm/SPARC: 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>
Acked-by: David S. Miller <davem@davemloft.net>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/sparc/kernel/leon_smp.c b/arch/sparc/kernel/leon_smp.c
index 9b40c9c12a0c986534a722858a2219bb8f87614a..6cfc1b09ec25a28a683a76aa6d2ebb4e1d288a2d 100644 (file)
--- a/arch/sparc/kernel/leon_smp.c
+++ b/arch/sparc/kernel/leon_smp.c
@@ -253,24 +253,15 @@ void __init leon_smp_done(void)
 
        /* Free unneeded trap tables */
        if (!cpu_present(1)) {
-               ClearPageReserved(virt_to_page(&trapbase_cpu1));
-               init_page_count(virt_to_page(&trapbase_cpu1));
-               free_page((unsigned long)&trapbase_cpu1);
-               totalram_pages++;
+               free_reserved_page(virt_to_page(&trapbase_cpu1));
                num_physpages++;
        }
        if (!cpu_present(2)) {
-               ClearPageReserved(virt_to_page(&trapbase_cpu2));
-               init_page_count(virt_to_page(&trapbase_cpu2));
-               free_page((unsigned long)&trapbase_cpu2);
-               totalram_pages++;
+               free_reserved_page(virt_to_page(&trapbase_cpu2));
                num_physpages++;
        }
        if (!cpu_present(3)) {
-               ClearPageReserved(virt_to_page(&trapbase_cpu3));
-               init_page_count(virt_to_page(&trapbase_cpu3));
-               free_page((unsigned long)&trapbase_cpu3);
-               totalram_pages++;
+               free_reserved_page(virt_to_page(&trapbase_cpu3));
                num_physpages++;
        }
        /* Ok, they are spinning and ready to go. */

diff --git a/arch/sparc/mm/init_32.c b/arch/sparc/mm/init_32.c
index 4490c397bb5b6216ef697814fcb381289e8a96fb..af472cf7c69a1998ab1b16dcba9edb884ef7e743 100644 (file)
--- a/arch/sparc/mm/init_32.c
+++ b/arch/sparc/mm/init_32.c
@@ -366,45 +366,14 @@ void __init mem_init(void)
 
 void free_initmem (void)
 {
-       unsigned long addr;
-       unsigned long freed;
-
-       addr = (unsigned long)(&__init_begin);
-       freed = (unsigned long)(&__init_end) - addr;
-       for (; addr < (unsigned long)(&__init_end); addr += PAGE_SIZE) {
-               struct page *p;
-
-               memset((void *)addr, POISON_FREE_INITMEM, PAGE_SIZE);
-               p = virt_to_page(addr);
-
-               ClearPageReserved(p);
-               init_page_count(p);
-               __free_page(p);
-               totalram_pages++;
-               num_physpages++;
-       }
-       printk(KERN_INFO "Freeing unused kernel memory: %ldk freed\n",
-               freed >> 10);
+       num_physpages += free_initmem_default(POISON_FREE_INITMEM);
 }
 
 #ifdef CONFIG_BLK_DEV_INITRD
 void free_initrd_mem(unsigned long start, unsigned long end)
 {
-       if (start < end)
-               printk(KERN_INFO "Freeing initrd memory: %ldk freed\n",
-                       (end - start) >> 10);
-       for (; start < end; start += PAGE_SIZE) {
-               struct page *p;
-
-               memset((void *)start, POISON_FREE_INITMEM, PAGE_SIZE);
-               p = virt_to_page(start);
-
-               ClearPageReserved(p);
-               init_page_count(p);
-               __free_page(p);
-               totalram_pages++;
-               num_physpages++;
-       }
+       num_physpages += free_reserved_area(start, end, POISON_FREE_INITMEM,
+                                           "initrd");
 }
 #endif
 

diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
index cf72a8a5b3aab58e0d741cc739bed85ace8f758f..a7171997adfdd4b7b5bf9154528b94c31b0a3bb3 100644 (file)
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c
@@ -2059,8 +2059,7 @@ void __init mem_init(void)
        /* We subtract one to account for the mem_map_zero page
         * allocated below.
         */
-       totalram_pages -= 1;
-       num_physpages = totalram_pages;
+       num_physpages = totalram_pages - 1;
 
        /*
         * Set up the zero page, mark it reserved, so that page count
@@ -2071,7 +2070,7 @@ void __init mem_init(void)
                prom_printf("paging_init: Cannot alloc zero page.\n");
                prom_halt();
        }
-       SetPageReserved(mem_map_zero);
+       mark_page_reserved(mem_map_zero);
 
        codepages = (((unsigned long) _etext) - ((unsigned long) _start));
        codepages = PAGE_ALIGN(codepages) >> PAGE_SHIFT;
@@ -2111,37 +2110,22 @@ void free_initmem(void)
        initend = (unsigned long)(__init_end) & PAGE_MASK;
        for (; addr < initend; addr += PAGE_SIZE) {
                unsigned long page;
-               struct page *p;
 
                page = (addr +
                        ((unsigned long) __va(kern_base)) -
                        ((unsigned long) KERNBASE));
                memset((void *)addr, POISON_FREE_INITMEM, PAGE_SIZE);
 
-               if (do_free) {
-                       p = virt_to_page(page);
-
-                       ClearPageReserved(p);
-                       init_page_count(p);
-                       __free_page(p);
-                       totalram_pages++;
-               }
+               if (do_free)
+                       free_reserved_page(virt_to_page(page));
        }
 }
 
 #ifdef CONFIG_BLK_DEV_INITRD
 void free_initrd_mem(unsigned long start, unsigned long end)
 {
-       if (start < end)
-               printk ("Freeing initrd memory: %ldk freed\n", (end - start) >> 10);
-       for (; start < end; start += PAGE_SIZE) {
-               struct page *p = virt_to_page(start);
-
-               ClearPageReserved(p);
-               init_page_count(p);
-               __free_page(p);
-               totalram_pages++;
-       }
+       num_physpages += free_reserved_area(start, end, POISON_FREE_INITMEM,
+                                           "initrd");
 }
 #endif