- Updated to 3.4-rc1.

[linux-flexiantxendom0-3.2.10.git] / arch / x86 / kernel / apic / probe_32.c

diff --git a/arch/x86/kernel/apic/probe_32.c b/arch/x86/kernel/apic/probe_32.c
index ff2c1b9..e14711d 100644 (file)
--- a/arch/x86/kernel/apic/probe_32.c
+++ b/arch/x86/kernel/apic/probe_32.c
@@ -240,7 +240,7 @@ generic_mps_oem_check(struct mpc_table *mpc, char *oem, char *productid)
                if (!(*drv)->mps_oem_check(mpc, oem, productid))
                        continue;
 
-               if (!cmdline_apic) {
+               if (!cmdline_apic && apic == &apic_default) {
                        apic = *drv;
                        printk(KERN_INFO "Switched to APIC driver `%s'.\n",
                               apic->name);
@@ -260,7 +260,7 @@ int __init default_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
                if (!(*drv)->acpi_madt_oem_check(oem_id, oem_table_id))
                        continue;
 
-               if (!cmdline_apic) {
+               if (!cmdline_apic && apic == &apic_default) {
                        apic = *drv;
                        printk(KERN_INFO "Switched to APIC driver `%s'.\n",
                               apic->name);