mm/ppc: 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: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Anatolij Gustschin <agust@denx.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/arch/powerpc/kernel/crash_dump.c b/arch/powerpc/kernel/crash_dump.c
index b3ba5163eae2d17614d1308fca7d672aa98b1ba3..9ec3fe174cba7c0ec859bcbb665aeba2b1cc1cb7 100644 (file)
--- a/arch/powerpc/kernel/crash_dump.c
+++ b/arch/powerpc/kernel/crash_dump.c
@@ -150,10 +150,7 @@ void crash_free_reserved_phys_range(unsigned long begin, unsigned long end)
                if (addr <= rtas_end && ((addr + PAGE_SIZE) > rtas_start))
                        continue;
 
-               ClearPageReserved(pfn_to_page(addr >> PAGE_SHIFT));
-               init_page_count(pfn_to_page(addr >> PAGE_SHIFT));
-               free_page((unsigned long)__va(addr));
-               totalram_pages++;
+               free_reserved_page(pfn_to_page(addr >> PAGE_SHIFT));
        }
 }
 #endif

diff --git a/arch/powerpc/kernel/fadump.c b/arch/powerpc/kernel/fadump.c
index 06c8202a69cf43a1689a8a98323d398872f80df1..2230fd0ca3e4fc089931f25a61c20cb66aa99a6a 100644 (file)
--- a/arch/powerpc/kernel/fadump.c
+++ b/arch/powerpc/kernel/fadump.c
@@ -1045,10 +1045,7 @@ static void fadump_release_memory(unsigned long begin, unsigned long end)
                if (addr <= ra_end && ((addr + PAGE_SIZE) > ra_start))
                        continue;
 
-               ClearPageReserved(pfn_to_page(addr >> PAGE_SHIFT));
-               init_page_count(pfn_to_page(addr >> PAGE_SHIFT));
-               free_page((unsigned long)__va(addr));
-               totalram_pages++;
+               free_reserved_page(pfn_to_page(addr >> PAGE_SHIFT));
        }
 }
 

diff --git a/arch/powerpc/kernel/kvm.c b/arch/powerpc/kernel/kvm.c
index a61b133c4f99b2a380b274fa7c39c7a5d301761a..6782221d49bde4d5b2074fba47e5bae8fab33d84 100644 (file)
--- a/arch/powerpc/kernel/kvm.c
+++ b/arch/powerpc/kernel/kvm.c
@@ -756,12 +756,7 @@ static __init void kvm_free_tmp(void)
        end = (ulong)&kvm_tmp[ARRAY_SIZE(kvm_tmp)] & PAGE_MASK;
 
        /* Free the tmp space we don't need */
-       for (; start < end; start += PAGE_SIZE) {
-               ClearPageReserved(virt_to_page(start));
-               init_page_count(virt_to_page(start));
-               free_page(start);
-               totalram_pages++;
-       }
+       free_reserved_area(start, end, 0, NULL);
 }
 
 static int __init kvm_guest_init(void)

diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
index f1f7409a418387dcd73d3791eab891ca4ea8e80d..c756713aaabab4cdd41f5895816aa306f8e86b54 100644 (file)
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
@@ -405,39 +405,14 @@ void __init mem_init(void)
 
 void free_initmem(void)
 {
-       unsigned long addr;
-
        ppc_md.progress = ppc_printk_progress;
-
-       addr = (unsigned long)__init_begin;
-       for (; addr < (unsigned long)__init_end; addr += PAGE_SIZE) {
-               memset((void *)addr, POISON_FREE_INITMEM, PAGE_SIZE);
-               ClearPageReserved(virt_to_page(addr));
-               init_page_count(virt_to_page(addr));
-               free_page(addr);
-               totalram_pages++;
-       }
-       pr_info("Freeing unused kernel memory: %luk freed\n",
-               ((unsigned long)__init_end -
-               (unsigned long)__init_begin) >> 10);
+       free_initmem_default(POISON_FREE_INITMEM);
 }
 
 #ifdef CONFIG_BLK_DEV_INITRD
 void __init free_initrd_mem(unsigned long start, unsigned long end)
 {
-       if (start >= end)
-               return;
-
-       start = _ALIGN_DOWN(start, PAGE_SIZE);
-       end = _ALIGN_UP(end, PAGE_SIZE);
-       pr_info("Freeing initrd memory: %ldk freed\n", (end - start) >> 10);
-
-       for (; start < end; start += PAGE_SIZE) {
-               ClearPageReserved(virt_to_page(start));
-               init_page_count(virt_to_page(start));
-               free_page(start);
-               totalram_pages++;
-       }
+       free_reserved_area(start, end, 0, "initrd");
 }
 #endif
 

diff --git a/arch/powerpc/platforms/512x/mpc512x_shared.c b/arch/powerpc/platforms/512x/mpc512x_shared.c
index 2765cd1c7678be29a39167473b4f866e389beabc..76885d5756e36879eb6d1a467705658b5b51439f 100644 (file)
--- a/arch/powerpc/platforms/512x/mpc512x_shared.c
+++ b/arch/powerpc/platforms/512x/mpc512x_shared.c
@@ -172,12 +172,9 @@ static struct fsl_diu_shared_fb __attribute__ ((__aligned__(8))) diu_shared_fb;
 
 static inline void mpc512x_free_bootmem(struct page *page)
 {
-       __ClearPageReserved(page);
        BUG_ON(PageTail(page));
        BUG_ON(atomic_read(&page->_count) > 1);
-       atomic_set(&page->_count, 1);
-       __free_page(page);
-       totalram_pages++;
+       free_reserved_page(page);
 }
 
 void mpc512x_release_bootmem(void)