ia64: contig/paging_init: reduce code duplication

The FLATMEM version of paging_init has calls to free_area_init_nodes() in
the end of every branch of 'if' and 'ifdef' statements.

Let's call this function outside the 'ifdef' and 'if' statements instead.

Signed-off-by: Mike Rapoport <rppt@linux.vnet.ibm.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>

diff --git a/arch/ia64/mm/contig.c b/arch/ia64/mm/contig.c
index 7d64b30913d1f1b20396de5922b42c8f6b34864e..1835144268eccb105c524d66074bc541866cd986 100644 (file)
--- a/arch/ia64/mm/contig.c
+++ b/arch/ia64/mm/contig.c
@@ -248,7 +248,6 @@ paging_init (void)
        efi_memmap_walk(find_largest_hole, (u64 *)&max_gap);
        if (max_gap < LARGE_GAP) {
                vmem_map = (struct page *) 0;
-               free_area_init_nodes(max_zone_pfns);
        } else {
                unsigned long map_size;
 
@@ -266,13 +265,12 @@ paging_init (void)
                 */
                NODE_DATA(0)->node_mem_map = vmem_map +
                        find_min_pfn_with_active_regions();
-               free_area_init_nodes(max_zone_pfns);
 
                printk("Virtual mem_map starts at 0x%p\n", mem_map);
        }
 #else /* !CONFIG_VIRTUAL_MEM_MAP */
        memblock_add_node(0, PFN_PHYS(max_low_pfn), 0);
-       free_area_init_nodes(max_zone_pfns);
 #endif /* !CONFIG_VIRTUAL_MEM_MAP */
+       free_area_init_nodes(max_zone_pfns);
        zero_page_memmap_ptr = virt_to_page(ia64_imva(empty_zero_page));
 }