diff options
Diffstat (limited to 'arch/mips/sgi-ip27/ip27-memory.c')
-rw-r--r-- | arch/mips/sgi-ip27/ip27-memory.c | 33 |
1 files changed, 3 insertions, 30 deletions
diff --git a/arch/mips/sgi-ip27/ip27-memory.c b/arch/mips/sgi-ip27/ip27-memory.c index 1230f56429d7..a95c00f5fb96 100644 --- a/arch/mips/sgi-ip27/ip27-memory.c +++ b/arch/mips/sgi-ip27/ip27-memory.c | |||
@@ -357,8 +357,6 @@ static void __init szmem(void) | |||
357 | int slot; | 357 | int slot; |
358 | cnodeid_t node; | 358 | cnodeid_t node; |
359 | 359 | ||
360 | num_physpages = 0; | ||
361 | |||
362 | for_each_online_node(node) { | 360 | for_each_online_node(node) { |
363 | nodebytes = 0; | 361 | nodebytes = 0; |
364 | for (slot = 0; slot < MAX_MEM_SLOTS; slot++) { | 362 | for (slot = 0; slot < MAX_MEM_SLOTS; slot++) { |
@@ -381,7 +379,6 @@ static void __init szmem(void) | |||
381 | slot = MAX_MEM_SLOTS; | 379 | slot = MAX_MEM_SLOTS; |
382 | continue; | 380 | continue; |
383 | } | 381 | } |
384 | num_physpages += slot_psize; | ||
385 | memblock_add_node(PFN_PHYS(slot_getbasepfn(node, slot)), | 382 | memblock_add_node(PFN_PHYS(slot_getbasepfn(node, slot)), |
386 | PFN_PHYS(slot_psize), node); | 383 | PFN_PHYS(slot_psize), node); |
387 | } | 384 | } |
@@ -480,32 +477,8 @@ void __init paging_init(void) | |||
480 | 477 | ||
481 | void __init mem_init(void) | 478 | void __init mem_init(void) |
482 | { | 479 | { |
483 | unsigned long codesize, datasize, initsize, tmp; | 480 | high_memory = (void *) __va(get_num_physpages() << PAGE_SHIFT); |
484 | unsigned node; | 481 | free_all_bootmem(); |
485 | |||
486 | high_memory = (void *) __va(num_physpages << PAGE_SHIFT); | ||
487 | |||
488 | for_each_online_node(node) { | ||
489 | /* | ||
490 | * This will free up the bootmem, ie, slot 0 memory. | ||
491 | */ | ||
492 | totalram_pages += free_all_bootmem_node(NODE_DATA(node)); | ||
493 | } | ||
494 | |||
495 | setup_zero_pages(); /* This comes from node 0 */ | 482 | setup_zero_pages(); /* This comes from node 0 */ |
496 | 483 | mem_init_print_info(NULL); | |
497 | codesize = (unsigned long) &_etext - (unsigned long) &_text; | ||
498 | datasize = (unsigned long) &_edata - (unsigned long) &_etext; | ||
499 | initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin; | ||
500 | |||
501 | tmp = nr_free_pages(); | ||
502 | printk(KERN_INFO "Memory: %luk/%luk available (%ldk kernel code, " | ||
503 | "%ldk reserved, %ldk data, %ldk init, %ldk highmem)\n", | ||
504 | tmp << (PAGE_SHIFT-10), | ||
505 | num_physpages << (PAGE_SHIFT-10), | ||
506 | codesize >> 10, | ||
507 | (num_physpages - tmp) << (PAGE_SHIFT-10), | ||
508 | datasize >> 10, | ||
509 | initsize >> 10, | ||
510 | totalhigh_pages << (PAGE_SHIFT-10)); | ||
511 | } | 484 | } |