Commit-ID: 35e4c6d30e6f69745d77afd5f63203ad440bed12 Gitweb: http://git.kernel.org/tip/35e4c6d30e6f69745d77afd5f63203ad440bed12 Author: Thomas Gleixner <[email protected]> AuthorDate: Thu, 15 Jan 2015 21:22:34 +0000 Committer: Thomas Gleixner <[email protected]> CommitDate: Thu, 22 Jan 2015 15:10:55 +0100
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 <[email protected]>C Acked-by: Borislav Petkov <[email protected]> Cc: Jiang Liu <[email protected]> Cc: Joerg Roedel <[email protected]> Cc: Tony Luck <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Thomas Gleixner <[email protected]> --- arch/x86/kernel/apic/apic.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index 0c554f5..3b4bdd5 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -1905,24 +1905,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; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
