Skip to contentSkip to conversation

i386: apic= command line option should always be honored

PATCH In review Jan Beulich 2 participants 2 messages Apr 26, 2006

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 i386: apic= command line option should always be honored

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.

diff -Npru /home/jbeulich/tmp/linux-2.6.17-rc2/arch/i386/mach-generic/probe.c 2.6.17-rc2-i386-honor-cmdline-apic-mode/arch/i386/mach-generic/probe.c

arch/i386/mach-generic/probe.c renamed from home/jbeulich/tmp/linux-2.6.17-rc2/arch/i386/mach-generic/probe.c +10 -6
@@ -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;
 		} 
 	} 
#1 lore raw
Quoted 3 lines · Jan Beulich

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.

Agreed yes.

I will put it into my tree for now because I already have some related patches.

-Andi