diff options
author | Jesper Nilsson <jespern@axis.com> | 2014-10-07 13:03:17 +0200 |
---|---|---|
committer | Jesper Nilsson <jespern@axis.com> | 2014-12-20 00:04:52 +0100 |
commit | 80d6170a289a1201480242d3570c5d7606ea1de9 (patch) | |
tree | b68b2a96d57a5de52269c069f1276c22d0e5e300 | |
parent | d6517c4c192b04016e2fbf12322bc6bd00f23835 (diff) | |
download | linux-stable-80d6170a289a1201480242d3570c5d7606ea1de9.tar.gz linux-stable-80d6170a289a1201480242d3570c5d7606ea1de9.tar.bz2 linux-stable-80d6170a289a1201480242d3570c5d7606ea1de9.zip |
CRIS: Update init memory handling
- Add free_initrd_mem as found by Guenter Roeck <linux@roeck-us.net>
- Add free_init_pages
- Export empty_zero_page symbol
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
-rw-r--r-- | arch/cris/mm/init.c | 38 |
1 files changed, 33 insertions, 5 deletions
diff --git a/arch/cris/mm/init.c b/arch/cris/mm/init.c index c81af5bd9167..1e7fd45b60f8 100644 --- a/arch/cris/mm/init.c +++ b/arch/cris/mm/init.c @@ -11,13 +11,15 @@ #include <linux/gfp.h> #include <linux/init.h> #include <linux/bootmem.h> +#include <linux/proc_fs.h> +#include <linux/kcore.h> #include <asm/tlb.h> #include <asm/sections.h> unsigned long empty_zero_page; +EXPORT_SYMBOL(empty_zero_page); -void __init -mem_init(void) +void __init mem_init(void) { BUG_ON(!mem_map); @@ -31,10 +33,36 @@ mem_init(void) mem_init_print_info(NULL); } -/* free the pages occupied by initialization code */ +/* Free a range of init pages. Virtual addresses. */ -void -free_initmem(void) +void free_init_pages(const char *what, unsigned long begin, unsigned long end) +{ + unsigned long addr; + + for (addr = begin; addr < 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 %s: %ldk freed\n", what, (end - begin) >> 10); +} + +/* Free the pages occupied by initialization code. */ + +void free_initmem(void) { free_initmem_default(-1); } + +/* Free the pages occupied by initrd code. */ + +#ifdef CONFIG_BLK_DEV_INITRD +void free_initrd_mem(unsigned long start, unsigned long end) +{ + free_init_pages("initrd memory", + start, + end); +} +#endif |