Commit 1d189474 authored by Mike Frysinger's avatar Mike Frysinger Committed by Bryan Wu

Blackfin arch: combine the common code of free_initrd_mem and free_initmem

Signed-off-by: default avatarMike Frysinger <michael.frysinger@analog.com>
Signed-off-by: default avatarBryan Wu <bryan.wu@analog.com>
parent 5610db61
...@@ -168,42 +168,31 @@ void __init mem_init(void) ...@@ -168,42 +168,31 @@ void __init mem_init(void)
} }
} }
#ifdef CONFIG_BLK_DEV_INITRD static __init void free_init_pages(const char *what, unsigned long begin, unsigned long end)
void __init free_initrd_mem(unsigned long start, unsigned long end)
{ {
int pages = 0; unsigned long addr;
for (; start < end; start += PAGE_SIZE) { /* next to check that the page we free is not a partial page */
ClearPageReserved(virt_to_page(start)); for (addr = begin; addr + PAGE_SIZE <= end; addr += PAGE_SIZE) {
init_page_count(virt_to_page(start)); ClearPageReserved(virt_to_page(addr));
free_page(start); init_page_count(virt_to_page(addr));
free_page(addr);
totalram_pages++; totalram_pages++;
pages++;
} }
printk(KERN_NOTICE "Freeing initrd memory: %dk freed\n", pages); printk(KERN_INFO "Freeing %s: %ldk freed\n", what, (end - begin) >> 10);
}
#ifdef CONFIG_BLK_DEV_INITRD
void __init free_initrd_mem(unsigned long start, unsigned long end)
{
free_init_pages("initrd memory", start, end);
} }
#endif #endif
void __init free_initmem(void) void __init free_initmem(void)
{ {
#ifdef CONFIG_RAMKERNEL #ifdef CONFIG_RAMKERNEL
unsigned long addr; free_init_pages("unused kernel memory",
/* (unsigned long)(&__init_begin),
* the following code should be cool even if these sections (unsigned long)(&__init_end));
* are not page aligned.
*/
addr = PAGE_ALIGN((unsigned long)(__init_begin));
/* next to check that the page we free is not a partial page */
for (; addr + PAGE_SIZE < (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_NOTICE
"Freeing unused kernel memory: %ldk freed (0x%x - 0x%x)\n",
(addr - PAGE_ALIGN((long)__init_begin)) >> 10,
(int)(PAGE_ALIGN((unsigned long)(__init_begin))),
(int)(addr - PAGE_SIZE));
#endif #endif
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment