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

Commit 1f75d7e3 authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar
Browse files

x86: introduce initmem_init for 64 bit 



Signed-off-by: default avatarYinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 17b4cceb

arch/x86/mm/init_64.c

+16 −0
Original line number Diff line number Diff line
@@ -611,6 +611,22 @@ unsigned long __init_refok init_memory_mapping(unsigned long start, unsigned lon 
}



#ifndef CONFIG_NUMA

void __init initmem_init(unsigned long start_pfn, unsigned long end_pfn)

{

	unsigned long bootmap_size, bootmap;



	bootmap_size = bootmem_bootmap_pages(end_pfn)<<PAGE_SHIFT;

	bootmap = find_e820_area(0, end_pfn<<PAGE_SHIFT, bootmap_size,

				 PAGE_SIZE);

	if (bootmap == -1L)

		panic("Cannot find bootmem map of size %ld\n", bootmap_size);

	bootmap_size = init_bootmem(bootmap >> PAGE_SHIFT, end_pfn);

	e820_register_active_regions(0, start_pfn, end_pfn);

	free_bootmem_with_active_regions(0, end_pfn);

	early_res_to_bootmem(0, end_pfn<<PAGE_SHIFT);

	reserve_bootmem(bootmap, bootmap_size, BOOTMEM_DEFAULT);

}



void __init paging_init(void)

{

	unsigned long max_zone_pfns[MAX_NR_ZONES];

arch/x86/mm/numa_64.c

+1 −1
Original line number Diff line number Diff line
@@ -514,7 +514,7 @@ static int __init numa_emulation(unsigned long start_pfn, unsigned long last_pfn 
}

#endif /* CONFIG_NUMA_EMU */



void __init numa_initmem_init(unsigned long start_pfn, unsigned long last_pfn)

void __init initmem_init(unsigned long start_pfn, unsigned long last_pfn)

{

	int i;

include/asm-x86/numa_64.h

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ extern int hotadd_percent; 


extern s16 apicid_to_node[MAX_LOCAL_APIC];



extern void numa_initmem_init(unsigned long start_pfn, unsigned long end_pfn);

extern unsigned long numa_free_all_bootmem(void);

extern void setup_node_bootmem(int nodeid, unsigned long start,

			       unsigned long end);

include/asm-x86/page_64.h

+1 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ typedef struct { pteval_t pte; } pte_t; 
extern unsigned long init_memory_mapping(unsigned long start,

					 unsigned long end);



extern void initmem_init(unsigned long start_pfn, unsigned long end_pfn);

#endif	/* !__ASSEMBLY__ */



#ifdef CONFIG_FLATMEM