ia64-split-virtual-map-initialization-out-of-paging_init.patch removed from -mm tree
The patch titled
Subject: ia64: split virtual map initialization out of paging_init()
has been removed from the -mm tree. Its filename was
ia64-split-virtual-map-initialization-out-of-paging_init.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Mike Rapoport <[email protected]>
Subject: 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.
---
arch/ia64/mm/contig.c | 34 ++++++++++++++++++++-------------- arch/ia64/mm/discontig.c | 37 ++++++++++++++++++++----------------- 2 files changed, 40 insertions(+), 31 deletions(-)
arch/ia64/mm/contig.c renamed from arch/ia64/mm/contig.c~ia64-split-virtual-map-initialization-out-of-paging_init +20 -14
@@ -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 renamed from arch/ia64/mm/discontig.c~ia64-split-virtual-map-initialization-out-of-paging_init +20 -17
@@ -584,6 +584,25 @@ void call_pernode_memory(unsigned long s } } +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 svoid __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;
_
Patches currently in -mm which might be from [email protected] are
mm-memblock-enforce-overlap-of-memorymemblock-and-memoryreserved.patch mm-fix-initialization-of-struct-page-for-holes-in-memory-layout.patch mm-add-definition-of-pmd_page_order.patch mmap-make-mlock_future_check-global.patch set_memory-allow-set_direct_map__noflush-for-multiple-pages.patch set_memory-allow-querying-whether-set_direct_map_-is-actually-enabled.patch mm-introduce-memfd_secret-system-call-to-create-secret-memory-areas.patch secretmem-use-pmd-size-pages-to-amortize-direct-map-fragmentation.patch secretmem-add-memcg-accounting.patch pm-hibernate-disable-when-there-are-active-secretmem-users.patch arch-mm-wire-up-memfd_secret-system-call-were-relevant.patch secretmem-test-add-basic-selftest-for-memfd_secret2.patch