lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mm/AVR32: prepare for removing num_physpages and simplify mem_init()

Browse Source 
Prepare for removing num_physpages and simplify mem_init().

Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
Acked-by: Hans-Christian Egtvedt <egtvedt@samfundet.no>
Cc: Haavard Skinnemoen <hskinnemoen@gmail.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-07-03 15:03:50 -07:00
committed by Linus Torvalds
parent bee4ebd117
commit 6703bdf669
1 changed files with 4 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
arch/avr32/mm/init.c
View File

@@ -100,26 +100,16 @@ void __init paging_init(void)
void __init mem_init(void) void __init mem_init(void)
{ {
int codesize, reservedpages, datasize, initsize; pg_data_t *pgdat;
int nid, i;
reservedpages = 0;
high_memory = NULL; high_memory = NULL;
/* this will put all low memory onto the freelists */ /* this will put all low memory onto the freelists */
for_each_online_node(nid) { for_each_online_pgdat(pgdat) {
pg_data_t *pgdat = NODE_DATA(nid);
unsigned long node_pages = 0;
void *node_high_memory; void *node_high_memory;
num_physpages += pgdat->node_present_pages;
if (pgdat->node_spanned_pages != 0) if (pgdat->node_spanned_pages != 0)
node_pages = free_all_bootmem_node(pgdat); free_all_bootmem_node(pgdat);
for (i = 0; i < node_pages; i++)
if (PageReserved(pgdat->node_mem_map + i))
reservedpages++;
node_high_memory = (void *)((pgdat->node_start_pfn node_high_memory = (void *)((pgdat->node_start_pfn
+ pgdat->node_spanned_pages) + pgdat->node_spanned_pages)
@@ -130,18 +120,7 @@ void __init mem_init(void)
max_mapnr = MAP_NR(high_memory); max_mapnr = MAP_NR(high_memory);
codesize = (unsigned long)_etext - (unsigned long)_text; mem_init_print_info(NULL);
datasize = (unsigned long)_edata - (unsigned long)_data;
initsize = (unsigned long)__init_end - (unsigned long)__init_begin;
printk ("Memory: %luk/%luk available (%dk kernel code, "
"%dk reserved, %dk data, %dk init)\n",
nr_free_pages() << (PAGE_SHIFT - 10),
totalram_pages << (PAGE_SHIFT - 10),
codesize >> 10,
reservedpages << (PAGE_SHIFT - 10),
datasize >> 10,
initsize >> 10);
} }
void free_initmem(void) void free_initmem(void)