hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Use common help functions to free reserved pages.

Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
Cc: David Howells <dhowells@redhat.com>
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:37 -07:00 committed by Linus Torvalds
parent 2e529815a6
commit 0516f88452
1 changed files with 4 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
arch/frv/mm/init.c
View File

@ -122,7 +122,7 @@ void __init mem_init(void)
#endif #endif
int codek = 0, datak = 0; int codek = 0, datak = 0;
/* this will put all memory onto the freelists */ /* this will put all low memory onto the freelists */
totalram_pages = free_all_bootmem(); totalram_pages = free_all_bootmem();
#ifdef CONFIG_MMU #ifdef CONFIG_MMU
@ -132,11 +132,7 @@ void __init mem_init(void)
#ifdef CONFIG_HIGHMEM #ifdef CONFIG_HIGHMEM
for (pfn = num_physpages - 1; pfn >= num_mappedpages; pfn--) { for (pfn = num_physpages - 1; pfn >= num_mappedpages; pfn--) {
struct page *page = &mem_map[pfn]; __free_reserved_page(&mem_map[pfn]);
ClearPageReserved(page);
init_page_count(page);
__free_page(page);
totalram_pages++; totalram_pages++;
} }
#endif #endif
@ -168,21 +164,7 @@ void __init mem_init(void)
void free_initmem(void) void free_initmem(void)
{ {
#if defined(CONFIG_RAMKERNEL) && !defined(CONFIG_PROTECT_KERNEL) #if defined(CONFIG_RAMKERNEL) && !defined(CONFIG_PROTECT_KERNEL)
unsigned long start, end, addr; free_initmem_default(0);
start = PAGE_ALIGN((unsigned long) &__init_begin); /* round up */
end = ((unsigned long) &__init_end) & PAGE_MASK; /* round down */
/* next to check that the page we free is not a partial page */
for (addr = start; addr < end; addr += PAGE_SIZE) {
ClearPageReserved(virt_to_page(addr));
init_page_count(virt_to_page(addr));
free_page(addr);
totalram_pages++;
}
printk("Freeing unused kernel memory: %ldKiB freed (0x%lx - 0x%lx)\n",
(end - start) >> 10, start, end);
#endif #endif
} /* end free_initmem() */ } /* end free_initmem() */
@ -193,14 +175,6 @@ void free_initmem(void)
#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)
{ {
int pages = 0; free_reserved_area(start, end, 0, "initrd");
for (; start < end; start += PAGE_SIZE) {
ClearPageReserved(virt_to_page(start));
init_page_count(virt_to_page(start));
free_page(start);
totalram_pages++;
pages++;
}
printk("Freeing initrd memory: %dKiB freed\n", (pages * PAGE_SIZE) >> 10);
} /* end free_initrd_mem() */ } /* end free_initrd_mem() */
#endif #endif