From: "Jan Beulich" Subject: [PATCH] honor apic= despite MADT/MPS OEM match Date: Tue, 25 Apr 2006 15:35:10 +0200 Message-ID: <444E41AE.76E4.0078.0@novell.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=__PartD9FCDE9E.0__=" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org This is a MIME message. If you are reading this text, you may want to consider changing to a mail reader or gateway that understands how to properly handle MIME multipart messages. --=__PartD9FCDE9E.0__= Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline 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 --=__PartD9FCDE9E.0__= Content-Type: text/plain; name="xen-x86-honor-apic-option.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="xen-x86-honor-apic-option.patch" --- 2006-04-21/xen/arch/x86/genapic/probe.c.0 2006-04-06 17:50:26.000000000 +0200 +++ 2006-04-21/xen/arch/x86/genapic/probe.c 2006-04-25 12:23:34.000000000 +0200 @@ -81,9 +81,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; } } @@ -95,9 +97,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; } } --=__PartD9FCDE9E.0__= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --=__PartD9FCDE9E.0__=--