Skip to content

Commit

Permalink
mm/AVR32: prepare for removing num_physpages and simplify mem_init()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
jiangliu authored and torvalds committed Jul 3, 2013
1 parent bee4ebd commit 6703bdf
Showing 1 changed file with 4 additions and 25 deletions.
29 changes: 4 additions & 25 deletions arch/avr32/mm/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -100,26 +100,16 @@ void __init paging_init(void)

void __init mem_init(void)
{
int codesize, reservedpages, datasize, initsize;
int nid, i;
pg_data_t *pgdat;

reservedpages = 0;
high_memory = NULL;

/* this will put all low memory onto the freelists */
for_each_online_node(nid) {
pg_data_t *pgdat = NODE_DATA(nid);
unsigned long node_pages = 0;
for_each_online_pgdat(pgdat) {
void *node_high_memory;

num_physpages += pgdat->node_present_pages;

if (pgdat->node_spanned_pages != 0)
node_pages = free_all_bootmem_node(pgdat);

for (i = 0; i < node_pages; i++)
if (PageReserved(pgdat->node_mem_map + i))
reservedpages++;
free_all_bootmem_node(pgdat);

node_high_memory = (void *)((pgdat->node_start_pfn
+ pgdat->node_spanned_pages)
Expand All @@ -130,18 +120,7 @@ void __init mem_init(void)

max_mapnr = MAP_NR(high_memory);

codesize = (unsigned long)_etext - (unsigned long)_text;
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);
mem_init_print_info(NULL);
}

void free_initmem(void)
Expand Down

0 comments on commit 6703bdf

Please sign in to comment.