honor apic= despite MADT/MPS OEM match
PATCH 1/1 honor apic= despite MADT/MPS OEM match
While other aspects of the system configuration may still be controlled by the outcome of the table scan, if apic= was given on the command line its effect should not be overridden here.
Signed-off-by Jan Beulich <[email protected]>
xen/arch/x86/genapic/probe.c renamed from xen/arch/x86/genapic/probe.c.0 +10 -6
@@ -81,9 +81,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 ; } }
@@ -95,9 +97,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 ; } }
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel