mm/PARISC: 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: "James E.J. Bottomley" <jejb@parisc-linux.org>
Cc: Helge Deller <deller@gmx.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c
index d8aaaf06ede221d55017a878a8ce54b5f31dc833..b4edc76c6f225a63aa856d1827fa72f6d87d2831 100644 (file)
--- a/arch/parisc/mm/init.c
+++ b/arch/parisc/mm/init.c
@@ -214,7 +214,6 @@ static void __init setup_bootmem(void)
        mem_limit_func();       /* check for "mem=" argument */
 
        mem_max = 0;
-       num_physpages = 0;
        for (i = 0; i < npmem_ranges; i++) {
                unsigned long rsize;
 
@@ -229,10 +228,8 @@ static void __init setup_bootmem(void)
                                npmem_ranges = i + 1;
                                mem_max = mem_limit;
                        }
-               num_physpages += pmem_ranges[i].pages;
                        break;
                }
-           num_physpages += pmem_ranges[i].pages;
                mem_max += rsize;
        }
 
@@ -532,7 +529,7 @@ void free_initmem(void)
         * pages are no-longer executable */
        flush_icache_range(init_begin, init_end);
        
-       num_physpages += free_initmem_default(-1);
+       free_initmem_default(-1);
 
        /* set up a new led state on systems shipped LED State panel */
        pdc_chassis_send_status(PDC_CHASSIS_DIRECT_BCOMPLETE);
@@ -580,8 +577,6 @@ unsigned long pcxl_dma_start __read_mostly;
 
 void __init mem_init(void)
 {
-       int codesize, reservedpages, datasize, initsize;
-
        /* Do sanity checks on page table constants */
        BUILD_BUG_ON(PTE_ENTRY_SIZE != sizeof(pte_t));
        BUILD_BUG_ON(PMD_ENTRY_SIZE != sizeof(pmd_t));
@@ -603,33 +598,6 @@ void __init mem_init(void)
        }
 #endif
 
-       codesize = (unsigned long)_etext - (unsigned long)_text;
-       datasize = (unsigned long)_edata - (unsigned long)_etext;
-       initsize = (unsigned long)__init_end - (unsigned long)__init_begin;
-
-       reservedpages = 0;
-{
-       unsigned long pfn;
-#ifdef CONFIG_DISCONTIGMEM
-       int i;
-
-       for (i = 0; i < npmem_ranges; i++) {
-               for (pfn = node_start_pfn(i); pfn < node_end_pfn(i); pfn++) {
-                       if (PageReserved(pfn_to_page(pfn)))
-                               reservedpages++;
-               }
-       }
-#else /* !CONFIG_DISCONTIGMEM */
-       for (pfn = 0; pfn < max_pfn; pfn++) {
-               /*
-                * Only count reserved RAM pages
-                */
-               if (PageReserved(pfn_to_page(pfn)))
-                       reservedpages++;
-       }
-#endif
-}
-
 #ifdef CONFIG_PA11
        if (hppa_dma_ops == &pcxl_dma_ops) {
                pcxl_dma_start = (unsigned long)SET_MAP_OFFSET(MAP_START);
@@ -643,15 +611,7 @@ void __init mem_init(void)
        parisc_vmalloc_start = SET_MAP_OFFSET(MAP_START);
 #endif
 
-       printk(KERN_INFO "Memory: %luk/%luk available (%dk kernel code, %dk reserved, %dk data, %dk init)\n",
-               nr_free_pages() << (PAGE_SHIFT-10),
-               num_physpages << (PAGE_SHIFT-10),
-               codesize >> 10,
-               reservedpages << (PAGE_SHIFT-10),
-               datasize >> 10,
-               initsize >> 10
-       );
-
+       mem_init_print_info(NULL);
 #ifdef CONFIG_DEBUG_KERNEL /* double-sanity-check paranoia */
        printk("virtual kernel memory layout:\n"
               "    vmalloc : 0x%p - 0x%p   (%4ld MB)\n"
@@ -1101,7 +1061,6 @@ void flush_tlb_all(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, -1,
-                                           "initrd");
+       free_reserved_area((void *)start, (void *)end, -1, "initrd");
 }
 #endif