mm/IA64: 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: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Zhang Yanfei <zhangyanfei@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/ia64/mm/contig.c b/arch/ia64/mm/contig.c
index 67c59ebec899c30ee4533880f3acb2bbc141ff02..e4a6a5366dea70c579bc8c91dc622ce9f2e12498 100644 (file)
--- a/arch/ia64/mm/contig.c
+++ b/arch/ia64/mm/contig.c
@@ -295,14 +295,6 @@ find_memory (void)
        alloc_per_cpu_data();
 }
 
-static int count_pages(u64 start, u64 end, void *arg)
-{
-       unsigned long *count = arg;
-
-       *count += (end - start) >> PAGE_SHIFT;
-       return 0;
-}
-
 /*
  * Set up the page tables.
  */
@@ -313,9 +305,6 @@ paging_init (void)
        unsigned long max_dma;
        unsigned long max_zone_pfns[MAX_NR_ZONES];
 
-       num_physpages = 0;
-       efi_memmap_walk(count_pages, &num_physpages);
-
        memset(max_zone_pfns, 0, sizeof(max_zone_pfns));
 #ifdef CONFIG_ZONE_DMA
        max_dma = virt_to_phys((void *) MAX_DMA_ADDRESS) >> PAGE_SHIFT;

diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c
index ae4db4bd6d97d77aebae5c7677e6803500770904..58550b8f7d40a6e8d361a1062d4eb5379a69e41b 100644 (file)
--- a/arch/ia64/mm/discontig.c
+++ b/arch/ia64/mm/discontig.c
@@ -37,7 +37,6 @@ struct early_node_data {
        struct ia64_node_data *node_data;
        unsigned long pernode_addr;
        unsigned long pernode_size;
-       unsigned long num_physpages;
 #ifdef CONFIG_ZONE_DMA
        unsigned long num_dma_physpages;
 #endif
@@ -732,7 +731,6 @@ static __init int count_node_pages(unsigned long start, unsigned long len, int n
 {
        unsigned long end = start + len;
 
-       mem_data[node].num_physpages += len >> PAGE_SHIFT;
 #ifdef CONFIG_ZONE_DMA
        if (start <= __pa(MAX_DMA_ADDRESS))
                mem_data[node].num_dma_physpages +=
@@ -778,7 +776,6 @@ void __init paging_init(void)
 #endif
 
        for_each_online_node(node) {
-               num_physpages += mem_data[node].num_physpages;
                pfn_offset = mem_data[node].min_pfn;
 
 #ifdef CONFIG_VIRTUAL_MEM_MAP

diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
index d141f7ea0be5611f444501bedd2a1bd7ef33ca53..2d372b4c5f70f27b20eb6e6f9bbe210731c4f990 100644 (file)
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c
@@ -545,19 +545,6 @@ int __init register_active_ranges(u64 start, u64 len, int nid)
        return 0;
 }
 
-static int __init
-count_reserved_pages(u64 start, u64 end, void *arg)
-{
-       unsigned long num_reserved = 0;
-       unsigned long *count = arg;
-
-       for (; start < end; start += PAGE_SIZE)
-               if (PageReserved(virt_to_page(start)))
-                       ++num_reserved;
-       *count += num_reserved;
-       return 0;
-}
-
 int
 find_max_min_low_pfn (u64 start, u64 end, void *arg)
 {
@@ -596,7 +583,6 @@ __setup("nolwsys", nolwsys_setup);
 void __init
 mem_init (void)
 {
-       long reserved_pages, codesize, datasize, initsize;
        pg_data_t *pgdat;
        int i;
 
@@ -624,18 +610,7 @@ mem_init (void)
                if (pgdat->bdata->node_bootmem_map)
                        free_all_bootmem_node(pgdat);
 
-       reserved_pages = 0;
-       efi_memmap_walk(count_reserved_pages, &reserved_pages);
-
-       codesize =  (unsigned long) _etext - (unsigned long) _stext;
-       datasize =  (unsigned long) _edata - (unsigned long) _etext;
-       initsize =  (unsigned long) __init_end - (unsigned long) __init_begin;
-
-       printk(KERN_INFO "Memory: %luk/%luk available (%luk code, %luk reserved, "
-              "%luk data, %luk init)\n", nr_free_pages() << (PAGE_SHIFT - 10),
-              num_physpages << (PAGE_SHIFT - 10), codesize >> 10,
-              reserved_pages << (PAGE_SHIFT - 10), datasize >> 10, initsize >> 10);
-
+       mem_init_print_info(NULL);
 
        /*
         * For fsyscall entrpoints with no light-weight handler, use the ordinary