hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

x86: introduce init_memory_mapping for 32bit #3 

move kva related early backto initmem_init for numa32

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Yinghai Lu 2008-06-24 12:19:41 -07:00 committed by Ingo Molnar
parent cfb0e53b05
commit 3a58a2a6c8
3 changed files with 6 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/x86/mm/discontig_32.c
View File

@ -200,7 +200,7 @@ void *alloc_remap(int nid, unsigned long size)
return allocation; return allocation;
} }
void __init remap_numa_kva(void) static void __init remap_numa_kva(void)
{ {
void *vaddr; void *vaddr;
unsigned long pfn; unsigned long pfn;
@ -373,12 +373,16 @@ void __init initmem_init(unsigned long start_pfn,
allocate_pgdat(nid); allocate_pgdat(nid);
} }
remap_numa_kva();
printk(KERN_DEBUG "High memory starts at vaddr %08lx\n", printk(KERN_DEBUG "High memory starts at vaddr %08lx\n",
(ulong) pfn_to_kaddr(highstart_pfn)); (ulong) pfn_to_kaddr(highstart_pfn));
for_each_online_node(nid) for_each_online_node(nid)
propagate_e820_map_node(nid); propagate_e820_map_node(nid);
memset(NODE_DATA(0), 0, sizeof(struct pglist_data)); for_each_online_node(nid)
memset(NODE_DATA(nid), 0, sizeof(struct pglist_data));
NODE_DATA(0)->bdata = &node0_bdata; NODE_DATA(0)->bdata = &node0_bdata;
setup_bootmem_allocator(); setup_bootmem_allocator();
} }

20
arch/x86/mm/init_32.c
View File

@ -449,7 +449,6 @@ static void __init pagetable_init(void)
paravirt_pagetable_setup_start(pgd_base); paravirt_pagetable_setup_start(pgd_base);
remap_numa_kva();
/* /*
* Fixed mappings, only the page table structure has to be * Fixed mappings, only the page table structure has to be
* created - mappings will be set by set_fixmap(): * created - mappings will be set by set_fixmap():
@ -724,24 +723,6 @@ void __init setup_bootmem_allocator(void)
after_init_bootmem = 1; after_init_bootmem = 1;
} }
/*
* The node 0 pgdat is initialized before all of these because
* it's needed for bootmem. node>0 pgdats have their virtual
* space allocated before the pagetables are in place to access
* them, so they can't be cleared then.
*
* This should all compile down to nothing when NUMA is off.
*/
static void __init remapped_pgdat_init(void)
{
int nid;
for_each_online_node(nid) {
if (nid != 0)
memset(NODE_DATA(nid), 0, sizeof(struct pglist_data));
}
}
static void __init find_early_table_space(unsigned long end) static void __init find_early_table_space(unsigned long end)
{ {
unsigned long puds, pmds, tables, start; unsigned long puds, pmds, tables, start;
@ -831,7 +812,6 @@ void __init paging_init(void)
/* /*
* NOTE: at this point the bootmem allocator is fully available. * NOTE: at this point the bootmem allocator is fully available.
*/ */
remapped_pgdat_init();
sparse_init(); sparse_init();
zone_sizes_init(); zone_sizes_init();

5
include/asm-x86/numa_32.h
View File

@ -5,12 +5,7 @@ extern int pxm_to_nid(int pxm);
extern void numa_remove_cpu(int cpu); extern void numa_remove_cpu(int cpu);
#ifdef CONFIG_NUMA #ifdef CONFIG_NUMA
extern void __init remap_numa_kva(void);
extern void set_highmem_pages_init(void); extern void set_highmem_pages_init(void);
#else
static inline void remap_numa_kva(void)
{
}
#endif #endif
#endif /* _ASM_X86_32_NUMA_H */ #endif /* _ASM_X86_32_NUMA_H */