diff options
| author | Yinghai Lu | 2008-06-27 10:41:56 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2008-07-08 13:16:04 +0200 |
| commit | f3294a33e765d8308c3e17b951a13e0db9cf5f00 (patch) | |
| tree | d73b3b157bd1e21b9dbbdd49bfbb64f5763accfb /arch/x86/kernel/setup.c | |
| parent | x86: early res print out alignment v2 (diff) | |
| download | kernel-qcow2-linux-f3294a33e765d8308c3e17b951a13e0db9cf5f00.tar.gz kernel-qcow2-linux-f3294a33e765d8308c3e17b951a13e0db9cf5f00.tar.xz kernel-qcow2-linux-f3294a33e765d8308c3e17b951a13e0db9cf5f00.zip | |
x86: let setup_arch call init_apic_mappings for 32bit
instead of calling it from trap_init()
also move init ioapic mapping out of apic_32.c
so 32 bit do same as 64 bit
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/setup.c')
| -rw-r--r-- | arch/x86/kernel/setup.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index bf528b23750a..4716460607b4 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -766,16 +766,14 @@ void __init setup_arch(char **cmdline_p) get_smp_config(); #endif -#ifdef CONFIG_X86_64 init_apic_mappings(); ioapic_init_mappings(); -#else -# if defined(CONFIG_SMP) && defined(CONFIG_X86_PC) + +#if defined(CONFIG_SMP) && defined(CONFIG_X86_PC) && defined(CONFIG_X86_32) if (def_to_bigsmp) printk(KERN_WARNING "More than 8 CPUs detected and " "CONFIG_X86_PC cannot handle it.\nUse " "CONFIG_X86_GENERICARCH or CONFIG_X86_BIGSMP.\n"); -# endif #endif kvm_guest_init(); |