[PATCH] i386: apic= command line option should always be

From: "Jan Beulich" <jbeulich@novell.com>

When using apic= on the kernel command line, this had no effect for machines
matched by either the ACPI MADT or the MPS OEM table scan. However, when such
option is specified, it should also take effect for this set of systems.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 10 insertions, 6 deletions

diff --git a/arch/i386/mach-generic/probe.c b/arch/i386/mach-generic/probe.c
index cea5b3ce4b57..d55fa7b187ab 100644
--- a/arch/i386/mach-generic/probe.c
+++ b/arch/i386/mach-generic/probe.c
@@ -93,9 +93,11 @@ int __init mps_oem_check(struct mp_config_table *mpc, char *oem, char *productid
         int i;
         for (i = 0; apic_probe[i]; ++i) { 
                 if (apic_probe[i]->mps_oem_check(mpc,oem,productid)) { 
-                        genapic = apic_probe[i];
-                        printk(KERN_INFO "Switched to APIC driver `%s'.\n", 
-                               genapic->name);
+                        if (!cmdline_apic) {
+                                genapic = apic_probe[i];
+                                printk(KERN_INFO "Switched to APIC driver `%s'.\n",
+                                       genapic->name);
+                        }
                         return 1;
                 } 
         } 
@@ -107,9 +109,11 @@ int __init acpi_madt_oem_check(char *oem_id, char *oem_table_id)
         int i;
         for (i = 0; apic_probe[i]; ++i) { 
                 if (apic_probe[i]->acpi_madt_oem_check(oem_id, oem_table_id)) { 
-                        genapic = apic_probe[i];
-                        printk(KERN_INFO "Switched to APIC driver `%s'.\n", 
-                               genapic->name);
+                        if (!cmdline_apic) {
+                                genapic = apic_probe[i];
+                                printk(KERN_INFO "Switched to APIC driver `%s'.\n",
+                                       genapic->name);
+                        }
                         return 1;
                 } 
         }