Skip to content

Commit

Permalink
mm/m32r: use common help functions to free reserved pages
Browse files Browse the repository at this point in the history
Use common help functions to free reserved pages.
Also include <asm/sections.h> to avoid local declarations.

Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
Cc: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Jiang Liu authored and Linus Torvalds committed Apr 29, 2013
1 parent 66f6259 commit 8be6585
Showing 1 changed file with 3 additions and 23 deletions.
26 changes: 3 additions & 23 deletions arch/m32r/mm/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,7 @@
#include <asm/mmu_context.h>
#include <asm/setup.h>
#include <asm/tlb.h>

/* References to section boundaries */
extern char _text, _etext, _edata;
extern char __init_begin, __init_end;
#include <asm/sections.h>

pgd_t swapper_pg_dir[1024];

Expand Down Expand Up @@ -184,17 +181,7 @@ void __init mem_init(void)
*======================================================================*/
void free_initmem(void)
{
unsigned long addr;

addr = (unsigned long)(&__init_begin);
for (; addr < (unsigned long)(&__init_end); addr += PAGE_SIZE) {
ClearPageReserved(virt_to_page(addr));
init_page_count(virt_to_page(addr));
free_page(addr);
totalram_pages++;
}
printk (KERN_INFO "Freeing unused kernel memory: %dk freed\n", \
(int)(&__init_end - &__init_begin) >> 10);
free_initmem_default(0);
}

#ifdef CONFIG_BLK_DEV_INITRD
Expand All @@ -204,13 +191,6 @@ void free_initmem(void)
*======================================================================*/
void free_initrd_mem(unsigned long start, unsigned long end)
{
unsigned long p;
for (p = start; p < end; p += PAGE_SIZE) {
ClearPageReserved(virt_to_page(p));
init_page_count(virt_to_page(p));
free_page(p);
totalram_pages++;
}
printk (KERN_INFO "Freeing initrd memory: %ldk freed\n", (end - start) >> 10);
free_reserved_area(start, end, 0, "initrd");
}
#endif

0 comments on commit 8be6585

Please sign in to comment.