Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 365358
b: refs/heads/master
c: 2e52981
h: refs/heads/master
v: v3
  • Loading branch information
Jiang Liu authored and Linus Torvalds committed Apr 29, 2013
1 parent 01b7d5b commit c0ac709
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 15 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: 95a259ed28204c7692fdf902b1742e50efc07c83
refs/heads/master: 2e529815a65a7c7ea61cad0b38e50967a2eb1677
16 changes: 2 additions & 14 deletions trunk/arch/cris/mm/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,10 @@
#include <linux/init.h>
#include <linux/bootmem.h>
#include <asm/tlb.h>
#include <asm/sections.h>

unsigned long empty_zero_page;

extern char _stext, _edata, _etext; /* From linkerscript */
extern char __init_begin, __init_end;

void __init
mem_init(void)
{
Expand Down Expand Up @@ -67,15 +65,5 @@ mem_init(void)
void
free_initmem(void)
{
unsigned long addr;

addr = (unsigned long)(&__init_begin);
for (; addr < (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: %luk freed\n",
(unsigned long)((&__init_end - &__init_begin) >> 10));
free_initmem_default(0);
}

0 comments on commit c0ac709

Please sign in to comment.