Commit 1f112129 authored by Mike Rapoport's avatar Mike Rapoport Committed by Linus Torvalds
Browse files

ia64: split virtual map initialization out of paging_init() 

For both FLATMEM and DISCONTIGMEM/SPARSEMEM the virtual map initialization
is spread over paging_init() for no good reason.

Split out the bits related to virtual map initialization to a helper
functions, one for FLATMEM and another for !FLATMEM configurations.

Link: https://lkml.kernel.org/r/20201101170454.9567-6-rppt@kernel.org


Signed-off-by: default avatarMike Rapoport <rppt@linux.ibm.com>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Greg Ungerer <gerg@linux-m68k.org>
Cc: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Matt Turner <mattst88@gmail.com>
Cc: Meelis Roos <mroos@linux.ee>
Cc: Michael Schmitz <schmitzmic@gmail.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Vineet Gupta <vgupta@synopsys.com>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b90b5547

arch/ia64/mm/contig.c

+20 −14
Original line number Diff line number Diff line
@@ -166,21 +166,8 @@ find_memory (void) 
	alloc_per_cpu_data();

}



/*

 * Set up the page tables.

 */



void __init

paging_init (void)

static void __init virtual_map_init(void)

{

	unsigned long max_dma;

	unsigned long max_zone_pfns[MAX_NR_ZONES];



	memset(max_zone_pfns, 0, sizeof(max_zone_pfns));

	max_dma = virt_to_phys((void *) MAX_DMA_ADDRESS) >> PAGE_SHIFT;

	max_zone_pfns[ZONE_DMA32] = max_dma;

	max_zone_pfns[ZONE_NORMAL] = max_low_pfn;



#ifdef CONFIG_VIRTUAL_MEM_MAP

	efi_memmap_walk(find_largest_hole, (u64 *)&max_gap);

	if (max_gap < LARGE_GAP) {
@@ -206,6 +193,25 @@ paging_init (void) 
		printk("Virtual mem_map starts at 0x%p\n", mem_map);

	}

#endif /* !CONFIG_VIRTUAL_MEM_MAP */

}



/*

 * Set up the page tables.

 */



void __init

paging_init (void)

{

	unsigned long max_dma;

	unsigned long max_zone_pfns[MAX_NR_ZONES];



	memset(max_zone_pfns, 0, sizeof(max_zone_pfns));

	max_dma = virt_to_phys((void *) MAX_DMA_ADDRESS) >> PAGE_SHIFT;

	max_zone_pfns[ZONE_DMA32] = max_dma;

	max_zone_pfns[ZONE_NORMAL] = max_low_pfn;



	virtual_map_init();



	free_area_init(max_zone_pfns);

	zero_page_memmap_ptr = virt_to_page(ia64_imva(empty_zero_page));

}

arch/ia64/mm/discontig.c

+20 −17
Original line number Diff line number Diff line
@@ -584,6 +584,25 @@ void call_pernode_memory(unsigned long start, unsigned long len, void *arg) 
	}

}



static void __init virtual_map_init(void)

{

#ifdef CONFIG_VIRTUAL_MEM_MAP

	int node;



	VMALLOC_END -= PAGE_ALIGN(ALIGN(max_low_pfn, MAX_ORDER_NR_PAGES) *

		sizeof(struct page));

	vmem_map = (struct page *) VMALLOC_END;

	efi_memmap_walk(create_mem_map_page_table, NULL);

	printk("Virtual mem_map starts at 0x%p\n", vmem_map);



	for_each_online_node(node) {

		unsigned long pfn_offset = mem_data[node].min_pfn;



		NODE_DATA(node)->node_mem_map = vmem_map + pfn_offset;

	}

#endif

}



/**

 * paging_init - setup page tables

 *
@@ -593,29 +612,13 @@ void call_pernode_memory(unsigned long start, unsigned long len, void *arg) 
void __init paging_init(void)

{

	unsigned long max_dma;

	unsigned long pfn_offset = 0;

	int node;

	unsigned long max_zone_pfns[MAX_NR_ZONES];



	max_dma = virt_to_phys((void *) MAX_DMA_ADDRESS) >> PAGE_SHIFT;



	sparse_init();



#ifdef CONFIG_VIRTUAL_MEM_MAP

	VMALLOC_END -= PAGE_ALIGN(ALIGN(max_low_pfn, MAX_ORDER_NR_PAGES) *

		sizeof(struct page));

	vmem_map = (struct page *) VMALLOC_END;

	efi_memmap_walk(create_mem_map_page_table, NULL);

	printk("Virtual mem_map starts at 0x%p\n", vmem_map);

#endif



	for_each_online_node(node) {

		pfn_offset = mem_data[node].min_pfn;



#ifdef CONFIG_VIRTUAL_MEM_MAP

		NODE_DATA(node)->node_mem_map = vmem_map + pfn_offset;

#endif

	}

	virtual_map_init();



	memset(max_zone_pfns, 0, sizeof(max_zone_pfns));

	max_zone_pfns[ZONE_DMA32] = max_dma;