Skip to contentSkip to conversation

i386: apic= command line option should always be

PATCH New Andi Kleen 1 participant 1 message May 28, 2006

lore
Share & tools
lore

Andi Kleen

author
#0 lore raw

PATCH 3/7 i386: apic= command line option should always be

From: "Jan Beulich" <[email protected]>

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.

---
 arch/i386/mach-generic/probe.c |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)
arch/i386/mach-generic/probe.c +10 -6
Index: linux-2.6.17-rc5/arch/i386/mach-generic/probe.c
===================================================================
@@ -93,9 +93,11 @@ int __init mps_oem_check(struct mp_confi
 	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
 	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;
 		} 
 	}