AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

mm/ppc: use common help functions to free reserved pages

Browse Source 
Use common help functions to free reserved pages.

Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Anatolij Gustschin <agust@denx.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jiang Liu 2013-04-29 15:06:47 -07:00 committed by Linus Torvalds
parent d3e5351b85
commit 5d585e5c48
5 changed files with 6 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/powerpc/kernel/crash_dump.c
View File

@ -150,10 +150,7 @@ void crash_free_reserved_phys_range(unsigned long begin, unsigned long end)
if (addr <= rtas_end && ((addr + PAGE_SIZE) > rtas_start)) if (addr <= rtas_end && ((addr + PAGE_SIZE) > rtas_start))
continue; continue;
ClearPageReserved(pfn_to_page(addr >> PAGE_SHIFT)); free_reserved_page(pfn_to_page(addr >> PAGE_SHIFT));
init_page_count(pfn_to_page(addr >> PAGE_SHIFT));
free_page((unsigned long)__va(addr));
totalram_pages++;
} }
} }
#endif #endif

5
arch/powerpc/kernel/fadump.c
View File

@ -1045,10 +1045,7 @@ static void fadump_release_memory(unsigned long begin, unsigned long end)
if (addr <= ra_end && ((addr + PAGE_SIZE) > ra_start)) if (addr <= ra_end && ((addr + PAGE_SIZE) > ra_start))
continue; continue;
ClearPageReserved(pfn_to_page(addr >> PAGE_SHIFT)); free_reserved_page(pfn_to_page(addr >> PAGE_SHIFT));
init_page_count(pfn_to_page(addr >> PAGE_SHIFT));
free_page((unsigned long)__va(addr));
totalram_pages++;
} }
} }

7
arch/powerpc/kernel/kvm.c
View File

@ -756,12 +756,7 @@ static __init void kvm_free_tmp(void)
end = (ulong)&kvm_tmp[ARRAY_SIZE(kvm_tmp)] & PAGE_MASK; end = (ulong)&kvm_tmp[ARRAY_SIZE(kvm_tmp)] & PAGE_MASK;
/* Free the tmp space we don't need */ /* Free the tmp space we don't need */
for (; start < end; start += PAGE_SIZE) { free_reserved_area(start, end, 0, NULL);
ClearPageReserved(virt_to_page(start));
init_page_count(virt_to_page(start));
free_page(start);
totalram_pages++;
}
} }
static int __init kvm_guest_init(void) static int __init kvm_guest_init(void)

29
arch/powerpc/mm/mem.c
View File

@ -405,39 +405,14 @@ void __init mem_init(void)
void free_initmem(void) void free_initmem(void)
{ {
unsigned long addr;
ppc_md.progress = ppc_printk_progress; ppc_md.progress = ppc_printk_progress;
free_initmem_default(POISON_FREE_INITMEM);
addr = (unsigned long)__init_begin;
for (; addr < (unsigned long)__init_end; addr += PAGE_SIZE) {
memset((void *)addr, POISON_FREE_INITMEM, PAGE_SIZE);
ClearPageReserved(virt_to_page(addr));
init_page_count(virt_to_page(addr));
free_page(addr);
totalram_pages++;
}
pr_info("Freeing unused kernel memory: %luk freed\n",
((unsigned long)__init_end -
(unsigned long)__init_begin) >> 10);
} }
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD
void __init free_initrd_mem(unsigned long start, unsigned long end) void __init free_initrd_mem(unsigned long start, unsigned long end)
{ {
if (start >= end) free_reserved_area(start, end, 0, "initrd");
return;
start = _ALIGN_DOWN(start, PAGE_SIZE);
end = _ALIGN_UP(end, PAGE_SIZE);
pr_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);
totalram_pages++;
}
} }
#endif #endif

5
arch/powerpc/platforms/512x/mpc512x_shared.c
View File

@ -172,12 +172,9 @@ static struct fsl_diu_shared_fb __attribute__ ((__aligned__(8))) diu_shared_fb;
static inline void mpc512x_free_bootmem(struct page *page) static inline void mpc512x_free_bootmem(struct page *page)
{ {
__ClearPageReserved(page);
BUG_ON(PageTail(page)); BUG_ON(PageTail(page));
BUG_ON(atomic_read(&page->_count) > 1); BUG_ON(atomic_read(&page->_count) > 1);
atomic_set(&page->_count, 1); free_reserved_page(page);
__free_page(page);
totalram_pages++;
} }
void mpc512x_release_bootmem(void) void mpc512x_release_bootmem(void)