WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-changelog

[Xen-changelog] While other aspects of the system configuration may stil

To: xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-changelog] While other aspects of the system configuration may still be
From: Xen patchbot -3.0-testing <patchbot-3.0-testing@xxxxxxxxxxxxxxxxxxx>
Date: Tue, 25 Apr 2006 21:26:19 +0000
Delivery-date: Tue, 25 Apr 2006 14:27:24 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id: BK change log <xen-changelog.lists.xensource.com>
List-post: <mailto:xen-changelog@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to: xen-devel@xxxxxxxxxxxxxxxxxxx
Sender: xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx
# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID f0d1a8f9d64f4caf20abe68f0b8573141736518c
# Parent  2ba859d51899470f6084188e955cf0f0c90b45f3
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 <jbeulich@xxxxxxxxxx>

diff -r 2ba859d51899 -r f0d1a8f9d64f xen/arch/x86/genapic/probe.c
--- a/xen/arch/x86/genapic/probe.c      Tue Apr 25 14:30:16 2006 +0100
+++ b/xen/arch/x86/genapic/probe.c      Tue Apr 25 14:51:10 2006 +0100
@@ -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;
                } 
        } 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog

<Prev in Thread] Current Thread [Next in Thread>