| Date | Thu, 15 Jan 2015 21:22:34 -0000 | From | Thomas Gleixner <> | Subject | [patch 16/23] x86/apic: Sanitize ioapic handling |
| |
We have proper stubs for the IOAPIC=n case and the setup/enable function have the required checks inside now. Remove the ifdeffery and the copy&pasted conditionals.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- arch/x86/kernel/apic/apic.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-)
Index: tip/arch/x86/kernel/apic/apic.c =================================================================== --- tip.orig/arch/x86/kernel/apic/apic.c +++ tip/arch/x86/kernel/apic/apic.c @@ -1903,24 +1903,13 @@ int __init APIC_init_uniprocessor(void) physid_set_mask_of_physid(boot_cpu_physical_apicid, &phys_cpu_present_map); setup_local_APIC(); -#ifdef CONFIG_X86_IO_APIC - /* - * Now enable IO-APICs, actually call clear_IO_APIC - * We need clear_IO_APIC before enabling error vector - */ - if (!skip_ioapic_setup && nr_ioapics) - enable_IO_APIC(); -#endif + /* Enable IO-APICs before enabling error vector */ + enable_IO_APIC(); bsp_end_local_APIC_setup(); -#ifdef CONFIG_X86_IO_APIC - if (smp_found_config && !skip_ioapic_setup && nr_ioapics) + if (smp_found_config) setup_IO_APIC(); - else { - nr_ioapics = 0; - } -#endif x86_init.timers.setup_percpu_clockev(); return 0;
|