Skip to content

Commit

Permalink
mm/unicore32: 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.

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>
  • Loading branch information
Jiang Liu authored and Linus Torvalds committed Apr 29, 2013
1 parent e16e0b1 commit ccecb51
Showing 1 changed file with 3 additions and 25 deletions.
28 changes: 3 additions & 25 deletions arch/unicore32/mm/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand All @@ -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)
Expand Down

0 comments on commit ccecb51

Please sign in to comment.