x86: make 32bit to call enable_IO_APIC early like 64bit
PATCH 1/1 x86: make 32bit to call enable_IO_APIC early like 64bit
Impact: cleanup
so remove some #ifdef
Signed-off-by Yinghai Lu <[email protected]>
--- arch/x86/kernel/io_apic.c | 4 ---- arch/x86/kernel/smpboot.c | 3 +-- 2 files changed, 1 insertion(+), 6 deletions(-)
arch/x86/kernel/io_apic.c +0 -4
@@ -3057,13 +3057,9 @@ out:void __init setup_IO_APIC (void ) { -#ifdef CONFIG_X86_32 -enable_IO_APIC (); -#else /* * calling enable_IO_APIC() is moved to setup_local_APIC for BP */ -#endif io_apic_irqs = ~PIC_IRQS ;
arch/x86/kernel/smpboot.c +1 -2
@@ -1154,13 +1154,12 @@ void __init native_smp_prepare_cpus(unsi*/ setup_local_APIC (); -#ifdef CONFIG_X86_64 /* * Enable IO APIC before setting up error vector */ if (!skip_ioapic_setup && nr_ioapics)enable_IO_APIC (); -#endif +end_local_APIC_setup ();map_cpu_to_logical_apicid ();
Ingo Molnar
AppliedQuoted 11 lines · Yinghai Lu
Impact: cleanup
so remove some #ifdef
Signed-off-by Yinghai Lu <[email protected]>--- arch/x86/kernel/io_apic.c | 4 ---- arch/x86/kernel/smpboot.c | 3 +-- 2 files changed, 1 insertion(+), 6 deletions(-)
Applied to tip:x86/apic, thanks Yinghai!
Ingo