mm/SPARC: 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>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Cc: Tang Chen <tangchen@cn.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/sparc/kernel/leon_smp.c b/arch/sparc/kernel/leon_smp.c
index 6cfc1b09ec25a28a683a76aa6d2ebb4e1d288a2d..d7aa524b72832d2555dcf2ffe831e5816641f840 100644 (file)
--- a/arch/sparc/kernel/leon_smp.c
+++ b/arch/sparc/kernel/leon_smp.c
@@ -254,15 +254,12 @@ void __init leon_smp_done(void)
        /* Free unneeded trap tables */
        if (!cpu_present(1)) {
                free_reserved_page(virt_to_page(&trapbase_cpu1));
-               num_physpages++;
        }
        if (!cpu_present(2)) {
                free_reserved_page(virt_to_page(&trapbase_cpu2));
-               num_physpages++;
        }
        if (!cpu_present(3)) {
                free_reserved_page(virt_to_page(&trapbase_cpu3));
-               num_physpages++;
        }
        /* Ok, they are spinning and ready to go. */
        smp_processors_ready = 1;

diff --git a/arch/sparc/mm/init_32.c b/arch/sparc/mm/init_32.c
index a438abb5495efa718cce7e43df01438ace4958b9..db69870828058db51e07699472cc9d9bcd3f7e34 100644 (file)
--- a/arch/sparc/mm/init_32.c
+++ b/arch/sparc/mm/init_32.c
@@ -288,10 +288,6 @@ static void map_high_region(unsigned long start_pfn, unsigned long end_pfn)
 
 void __init mem_init(void)
 {
-       int codepages = 0;
-       int datapages = 0;
-       int initpages = 0; 
-       int reservedpages = 0;
        int i;
 
        if (PKMAP_BASE+LAST_PKMAP*PAGE_SIZE >= FIXADDR_START) {
@@ -329,8 +325,6 @@ void __init mem_init(void)
                unsigned long start_pfn = sp_banks[i].base_addr >> PAGE_SHIFT;
                unsigned long end_pfn = (sp_banks[i].base_addr + sp_banks[i].num_bytes) >> PAGE_SHIFT;
 
-               num_physpages += sp_banks[i].num_bytes >> PAGE_SHIFT;
-
                if (end_pfn <= highstart_pfn)
                        continue;
 
@@ -340,39 +334,19 @@ void __init mem_init(void)
                map_high_region(start_pfn, end_pfn);
        }
        
-       codepages = (((unsigned long) &_etext) - ((unsigned long)&_start));
-       codepages = PAGE_ALIGN(codepages) >> PAGE_SHIFT;
-       datapages = (((unsigned long) &_edata) - ((unsigned long)&_etext));
-       datapages = PAGE_ALIGN(datapages) >> PAGE_SHIFT;
-       initpages = (((unsigned long) &__init_end) - ((unsigned long) &__init_begin));
-       initpages = PAGE_ALIGN(initpages) >> PAGE_SHIFT;
-
-       /* Ignore memory holes for the purpose of counting reserved pages */
-       for (i=0; i < max_low_pfn; i++)
-               if (test_bit(i >> (20 - PAGE_SHIFT), sparc_valid_addr_bitmap)
-                   && PageReserved(pfn_to_page(i)))
-                       reservedpages++;
-
-       printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, %dk reserved, %dk data, %dk init, %ldk highmem)\n",
-              nr_free_pages() << (PAGE_SHIFT-10),
-              num_physpages << (PAGE_SHIFT - 10),
-              codepages << (PAGE_SHIFT-10),
-              reservedpages << (PAGE_SHIFT - 10),
-              datapages << (PAGE_SHIFT-10), 
-              initpages << (PAGE_SHIFT-10),
-              totalhigh_pages << (PAGE_SHIFT-10));
+       mem_init_print_info(NULL);
 }
 
 void free_initmem (void)
 {
-       num_physpages += free_initmem_default(POISON_FREE_INITMEM);
+       free_initmem_default(POISON_FREE_INITMEM);
 }
 
 #ifdef CONFIG_BLK_DEV_INITRD
 void free_initrd_mem(unsigned long start, unsigned long end)
 {
-       num_physpages += free_reserved_area((void *)start, (void *)end,
-                                           POISON_FREE_INITMEM, "initrd");
+       free_reserved_area((void *)start, (void *)end, POISON_FREE_INITMEM,
+                          "initrd");
 }
 #endif
 

diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
index 752d73837f9ecd7d31d1e9d25cacc24a2fe9d3a4..a9c42a7ffb6a611a4b39129d3d698a2e710b863e 100644 (file)
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c
@@ -2045,7 +2045,6 @@ static void __init register_page_bootmem_info(void)
 }
 void __init mem_init(void)
 {
-       unsigned long codepages, datapages, initpages;
        unsigned long addr, last;
 
        addr = PAGE_OFFSET + kern_base;
@@ -2063,11 +2062,6 @@ void __init mem_init(void)
        register_page_bootmem_info();
        free_all_bootmem();
 
-       /* We subtract one to account for the mem_map_zero page
-        * allocated below.
-        */
-       num_physpages = totalram_pages - 1;
-
        /*
         * Set up the zero page, mark it reserved, so that page count
         * is not manipulated when freeing the page from user ptes.
@@ -2079,19 +2073,7 @@ void __init mem_init(void)
        }
        mark_page_reserved(mem_map_zero);
 
-       codepages = (((unsigned long) _etext) - ((unsigned long) _start));
-       codepages = PAGE_ALIGN(codepages) >> PAGE_SHIFT;
-       datapages = (((unsigned long) _edata) - ((unsigned long) _etext));
-       datapages = PAGE_ALIGN(datapages) >> PAGE_SHIFT;
-       initpages = (((unsigned long) __init_end) - ((unsigned long) __init_begin));
-       initpages = PAGE_ALIGN(initpages) >> PAGE_SHIFT;
-
-       printk("Memory: %luk available (%ldk kernel code, %ldk data, %ldk init) [%016lx,%016lx]\n",
-              nr_free_pages() << (PAGE_SHIFT-10),
-              codepages << (PAGE_SHIFT-10),
-              datapages << (PAGE_SHIFT-10), 
-              initpages << (PAGE_SHIFT-10), 
-              PAGE_OFFSET, (last_valid_pfn << PAGE_SHIFT));
+       mem_init_print_info(NULL);
 
        if (tlb_type == cheetah || tlb_type == cheetah_plus)
                cheetah_ecache_flush_init();
@@ -2131,8 +2113,8 @@ void free_initmem(void)
 #ifdef CONFIG_BLK_DEV_INITRD
 void free_initrd_mem(unsigned long start, unsigned long end)
 {
-       num_physpages += free_reserved_area((void *)start, (void *)end,
-                                           POISON_FREE_INITMEM, "initrd");
+       free_reserved_area((void *)start, (void *)end, POISON_FREE_INITMEM,
+                          "initrd");
 }
 #endif