[PATCH v2, part1 17/29] mm/parisc: use common help functions to free reserved pages

2013-03-09 Thread Jiang Liu
Use common help functions to free reserved pages.

Signed-off-by: Jiang Liu 
Cc: "James E.J. Bottomley" 
Cc: Helge Deller 
---
 arch/parisc/mm/init.c |   23 ++-
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c
index 3ac462d..de2159a 100644
--- a/arch/parisc/mm/init.c
+++ b/arch/parisc/mm/init.c
@@ -505,7 +505,6 @@ static void __init map_pages(unsigned long start_vaddr,
 
 void free_initmem(void)
 {
-   unsigned long addr;
unsigned long init_begin = (unsigned long)__init_begin;
unsigned long init_end = (unsigned long)__init_end;
 
@@ -533,19 +532,10 @@ void free_initmem(void)
 * pages are no-longer executable */
flush_icache_range(init_begin, init_end);

-   for (addr = init_begin; addr < init_end; addr += PAGE_SIZE) {
-   ClearPageReserved(virt_to_page(addr));
-   init_page_count(virt_to_page(addr));
-   free_page(addr);
-   num_physpages++;
-   totalram_pages++;
-   }
+   num_physpages += free_initmem_default(0);
 
/* set up a new led state on systems shipped LED State panel */
pdc_chassis_send_status(PDC_CHASSIS_DIRECT_BCOMPLETE);
-   
-   printk(KERN_INFO "Freeing unused kernel memory: %luk freed\n",
-   (init_end - init_begin) >> 10);
 }
 
 
@@ -1107,15 +1097,6 @@ void flush_tlb_all(void)
 #ifdef CONFIG_BLK_DEV_INITRD
 void free_initrd_mem(unsigned long start, unsigned long end)
 {
-   if (start >= end)
-   return;
-   printk(KERN_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);
-   num_physpages++;
-   totalram_pages++;
-   }
+   num_physpages += free_reserved_area(start, end, 0, "initrd");
 }
 #endif
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[PATCH v2, part1 17/29] mm/parisc: use common help functions to free reserved pages

2013-03-09 Thread Jiang Liu
Use common help functions to free reserved pages.

Signed-off-by: Jiang Liu jiang@huawei.com
Cc: James E.J. Bottomley j...@parisc-linux.org
Cc: Helge Deller del...@gmx.de
---
 arch/parisc/mm/init.c |   23 ++-
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c
index 3ac462d..de2159a 100644
--- a/arch/parisc/mm/init.c
+++ b/arch/parisc/mm/init.c
@@ -505,7 +505,6 @@ static void __init map_pages(unsigned long start_vaddr,
 
 void free_initmem(void)
 {
-   unsigned long addr;
unsigned long init_begin = (unsigned long)__init_begin;
unsigned long init_end = (unsigned long)__init_end;
 
@@ -533,19 +532,10 @@ void free_initmem(void)
 * pages are no-longer executable */
flush_icache_range(init_begin, init_end);

-   for (addr = init_begin; addr  init_end; addr += PAGE_SIZE) {
-   ClearPageReserved(virt_to_page(addr));
-   init_page_count(virt_to_page(addr));
-   free_page(addr);
-   num_physpages++;
-   totalram_pages++;
-   }
+   num_physpages += free_initmem_default(0);
 
/* set up a new led state on systems shipped LED State panel */
pdc_chassis_send_status(PDC_CHASSIS_DIRECT_BCOMPLETE);
-   
-   printk(KERN_INFO Freeing unused kernel memory: %luk freed\n,
-   (init_end - init_begin)  10);
 }
 
 
@@ -1107,15 +1097,6 @@ void flush_tlb_all(void)
 #ifdef CONFIG_BLK_DEV_INITRD
 void free_initrd_mem(unsigned long start, unsigned long end)
 {
-   if (start = end)
-   return;
-   printk(KERN_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);
-   num_physpages++;
-   totalram_pages++;
-   }
+   num_physpages += free_reserved_area(start, end, 0, initrd);
 }
 #endif
-- 
1.7.9.5

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/