Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 365367
b: refs/heads/master
c: 7932f61
h: refs/heads/master
i:
  365365: 6727b2d
  365363: bb93790
  365359: 97f5d89
v: v3
  • Loading branch information
Jiang Liu authored and Linus Torvalds committed Apr 29, 2013
1 parent 9c362a8 commit de31ea5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 25 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: 32ce012064b3cc89d2081d34a745af598e5e56c5
refs/heads/master: 7932f61ba888a9daa3a82eaf8939902ac82029d3
27 changes: 3 additions & 24 deletions trunk/arch/openrisc/mm/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
#include <asm/kmap_types.h>
#include <asm/fixmap.h>
#include <asm/tlbflush.h>
#include <asm/sections.h>

int mem_init_done;

Expand Down Expand Up @@ -201,9 +202,6 @@ void __init paging_init(void)

/* References to section boundaries */

extern char _stext, _etext, _edata, __bss_start, _end;
extern char __init_begin, __init_end;

static int __init free_pages_init(void)
{
int reservedpages, pfn;
Expand Down Expand Up @@ -263,30 +261,11 @@ void __init mem_init(void)
#ifdef CONFIG_BLK_DEV_INITRD
void free_initrd_mem(unsigned long start, unsigned long end)
{
printk(KERN_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++;
}
free_reserved_area(start, end, 0, "initrd");
}
#endif

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 -
(unsigned long)&__init_begin) >> 10);
free_initmem_default(0);
}

0 comments on commit de31ea5

Please sign in to comment.