i386: apic= command line option should always be
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.
Signed-off-by Jan Beulich <[email protected]>
Signed-off-by Andi Kleen <[email protected]>
--- arch/i386/mach-generic/probe.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-)
arch/i386/mach-generic/probe.c +10 -6
@@ -93,9 +93,11 @@ int __init mps_oem_check(struct mp_confiint 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 *oemint 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 ; } }