Messages in this thread Patch in this message | | | Date | Wed, 26 Apr 2006 15:52:53 +0200 | From | "Jan Beulich" <> | Subject | [PATCH] 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.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
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 --- /home/jbeulich/tmp/linux-2.6.17-rc2/arch/i386/mach-generic/probe.c 2006-03-20 06:53:29.000000000 +0100 +++ 2.6.17-rc2-i386-honor-cmdline-apic-mode/arch/i386/mach-generic/probe.c 2006-04-25 11:34:46.000000000 +0200 @@ -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; } }
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |