Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ecd64ab authored by Mike Rapoport's avatar Mike Rapoport Committed by Tony Luck
Browse files

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: default avatarMike Rapoport <rppt@linux.vnet.ibm.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent d72e90f3

arch/ia64/mm/contig.c

+1 −3
Original line number Diff line number Diff line
@@ -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));

}