diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-26 17:30:33 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-26 17:30:33 +0200 |
| commit | 0791e98dd1cd1833547f814188b25b6c8c711ad5 (patch) | |
| tree | 7a55a18a4d10d1f8565be7399381f543362cbb32 /arch/x86/kernel/apic/probe_32.c | |
| parent | edb34a4dbdfec6fd83fe907dbf4498eedc77e17e (diff) | |
| parent | 141d55e6cc590293ea1378f55b9ebd38f5024bf0 (diff) | |
Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
* 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/irq: Standardize on CONFIG_SPARSE_IRQ=y
x86, ioapic: Clean up ioapic/apic_id usage
x86, ioapic: Factor out print_IO_APIC() to only print one io apic
x86, ioapic: Print out irte with right ioapic index
x86, ioapic: Split up setup_ioapic_entry()
x86, ioapic: Pass struct irq_attr * to setup_ioapic_irq()
apic, i386/bigsmp: Fix false warnings regarding logical APIC ID mismatches
Diffstat (limited to 'arch/x86/kernel/apic/probe_32.c')
| -rw-r--r-- | arch/x86/kernel/apic/probe_32.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/x86/kernel/apic/probe_32.c b/arch/x86/kernel/apic/probe_32.c index b5254ad044ab..0787bb3412f4 100644 --- a/arch/x86/kernel/apic/probe_32.c +++ b/arch/x86/kernel/apic/probe_32.c @@ -200,14 +200,8 @@ void __init default_setup_apic_routing(void) * - we find more than 8 CPUs in acpi LAPIC listing with xAPIC support */ - if (!cmdline_apic && apic == &apic_default) { - struct apic *bigsmp = generic_bigsmp_probe(); - if (bigsmp) { - apic = bigsmp; - printk(KERN_INFO "Overriding APIC driver with %s\n", - apic->name); - } - } + if (!cmdline_apic && apic == &apic_default) + generic_bigsmp_probe(); #endif if (apic->setup_apic_routing) |