x86: extend e820 ealy_res support 32bit
move early_res related from e820_64.c to e820.c make edba detection to be done in head32.c remove smp_alloc_memory, because we have fixed trampoline address now. Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com> arch/x86/kernel/e820.c | 214 ++++++++++++++++++++++++++++++++++++ arch/x86/kernel/e820_64.c | 196 -------------------------------- arch/x86/kernel/head32.c | 76 ++++++++++++ arch/x86/kernel/setup_32.c | 109 +++--------------- arch/x86/kernel/smpboot.c | 17 -- arch/x86/kernel/trampoline.c | 2 arch/x86/mach-voyager/voyager_smp.c | 9 - include/asm-x86/e820.h | 6 + include/asm-x86/e820_64.h | 9 - include/asm-x86/smp.h | 1 arch/x86/kernel/e820.c | 214 ++++++++++++++++++++++++++++++++++++ arch/x86/kernel/e820_64.c | 196 -------------------------------- arch/x86/kernel/head32.c | 76 ++++++++++++ arch/x86/kernel/setup_32.c | 109 +++--------------- arch/x86/kernel/smpboot.c | 17 -- arch/x86/kernel/trampoline.c | 2 arch/x86/mach-voyager/voyager_smp.c | 9 - include/asm-x86/e820.h | 6 + include/asm-x86/e820_64.h | 9 - include/asm-x86/smp.h | 1 arch/x86/kernel/e820.c | 214 ++++++++++++++++++++++++++++++++++++ arch/x86/kernel/e820_64.c | 196 -------------------------------- arch/x86/kernel/head32.c | 76 ++++++++++++ arch/x86/kernel/setup_32.c | 109 +++--------------- arch/x86/kernel/smpboot.c | 17 -- arch/x86/kernel/trampoline.c | 2 arch/x86/mach-voyager/voyager_smp.c | 9 - include/asm-x86/e820.h | 6 + include/asm-x86/e820_64.h | 9 - include/asm-x86/smp.h | 1 10 files changed, 320 insertions(+), 319 deletions(-) Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:

committed by
Thomas Gleixner

parent
69c9189320
commit
a4c81cf684
@@ -555,23 +555,6 @@ cpumask_t cpu_coregroup_map(int cpu)
|
||||
return c->llc_shared_map;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_X86_32
|
||||
/*
|
||||
* We are called very early to get the low memory for the
|
||||
* SMP bootup trampoline page.
|
||||
*/
|
||||
void __init smp_alloc_memory(void)
|
||||
{
|
||||
trampoline_base = alloc_bootmem_low_pages(PAGE_SIZE);
|
||||
/*
|
||||
* Has to be in very low memory so we can execute
|
||||
* real-mode AP code.
|
||||
*/
|
||||
if (__pa(trampoline_base) >= 0x9F000)
|
||||
BUG();
|
||||
}
|
||||
#endif
|
||||
|
||||
static void impress_friends(void)
|
||||
{
|
||||
int cpu;
|
||||
|
Reference in New Issue
Block a user