Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 365357
b: refs/heads/master
c: 95a259e
h: refs/heads/master
i:
  365355: 4588841
v: v3
  • Loading branch information
Jiang Liu authored and Linus Torvalds committed Apr 29, 2013
1 parent 332816d commit 01b7d5b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 29 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ed8a36f50381e3d10fa57aba4088d67e9d55b0e5
refs/heads/master: 95a259ed28204c7692fdf902b1742e50efc07c83
30 changes: 2 additions & 28 deletions trunk/arch/c6x/mm/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -77,37 +77,11 @@ void __init mem_init(void)
#ifdef CONFIG_BLK_DEV_INITRD
void __init free_initrd_mem(unsigned long start, unsigned long end)
{
int pages = 0;
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(KERN_INFO "Freeing initrd memory: %luk freed\n",
(pages * PAGE_SIZE) >> 10);
free_reserved_area(start, end, 0, "initrd");
}
#endif

void __init free_initmem(void)
{
unsigned long addr;

/*
* The following code should be cool even if these sections
* 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_INFO "Freeing unused kernel memory: %dK freed\n",
(int) ((addr - PAGE_ALIGN((long) &__init_begin)) >> 10));
free_initmem_default(0);
}

0 comments on commit 01b7d5b

Please sign in to comment.