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

Prepare for removing num_physpages and simplify mem_init().

Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: David Daney <david.daney@cavium.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: John Crispin <blogic@openwrt.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Minchan Kim <minchan@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 2 insertions, 19 deletions

diff --git a/arch/mips/sgi-ip27/ip27-memory.c b/arch/mips/sgi-ip27/ip27-memory.c
index aecac4a08360..a0c9e34147c2 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)
         int slot;
         cnodeid_t node;
 
-        num_physpages = 0;
-
         for_each_online_node(node) {
                 nodebytes = 0;
                 for (slot = 0; slot < MAX_MEM_SLOTS; slot++) {
@@ -381,7 +379,6 @@ static void __init szmem(void)
                                 slot = MAX_MEM_SLOTS;
                                 continue;
                         }
-                        num_physpages += slot_psize;
                         memblock_add_node(PFN_PHYS(slot_getbasepfn(node, slot)),
                                           PFN_PHYS(slot_psize), node);
                 }
@@ -480,10 +477,9 @@ void __init paging_init(void)
 
 void __init mem_init(void)
 {
-        unsigned long codesize, datasize, initsize, tmp;
         unsigned node;
 
-        high_memory = (void *) __va(num_physpages << PAGE_SHIFT);
+        high_memory = (void *) __va(get_num_physpages() << PAGE_SHIFT);
 
         for_each_online_node(node) {
                 /*
@@ -494,18 +490,5 @@ void __init mem_init(void)
 
         setup_zero_pages();     /* This comes from node 0 */
 
-        codesize =  (unsigned long) &_etext - (unsigned long) &_text;
-        datasize =  (unsigned long) &_edata - (unsigned long) &_etext;
-        initsize =  (unsigned long) &__init_end - (unsigned long) &__init_begin;
-
-        tmp = nr_free_pages();
-        printk(KERN_INFO "Memory: %luk/%luk available (%ldk kernel code, "
-               "%ldk reserved, %ldk data, %ldk init, %ldk highmem)\n",
-               tmp << (PAGE_SHIFT-10),
-               num_physpages << (PAGE_SHIFT-10),
-               codesize >> 10,
-               (num_physpages - tmp) << (PAGE_SHIFT-10),
-               datasize >> 10,
-               initsize >> 10,
-               totalhigh_pages << (PAGE_SHIFT-10));
+        mem_init_print_info(NULL);
 }