ia64/xen-unstable

changeset 9846:101bfb71cc56

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@novell.com>
author kaf24@firebug.cl.cam.ac.uk
date Tue Apr 25 14:50:32 2006 +0100 (2006-04-25)
parents a1d0761b59ca
children 7e8bb50fa8fa
files xen/arch/x86/genapic/probe.c
line diff
     1.1 --- a/xen/arch/x86/genapic/probe.c	Tue Apr 25 14:20:08 2006 +0100
     1.2 +++ b/xen/arch/x86/genapic/probe.c	Tue Apr 25 14:50:32 2006 +0100
     1.3 @@ -81,9 +81,11 @@ int __init mps_oem_check(struct mp_confi
     1.4  	int i;
     1.5  	for (i = 0; apic_probe[i]; ++i) { 
     1.6  		if (apic_probe[i]->mps_oem_check(mpc,oem,productid)) { 
     1.7 -			genapic = apic_probe[i];
     1.8 -			printk(KERN_INFO "Switched to APIC driver `%s'.\n", 
     1.9 -			       genapic->name);
    1.10 +			if (!cmdline_apic) {
    1.11 +				genapic = apic_probe[i];
    1.12 +				printk(KERN_INFO "Switched to APIC driver `%s'.\n", 
    1.13 +				       genapic->name);
    1.14 +			}
    1.15  			return 1;
    1.16  		} 
    1.17  	} 
    1.18 @@ -95,9 +97,11 @@ int __init acpi_madt_oem_check(char *oem
    1.19  	int i;
    1.20  	for (i = 0; apic_probe[i]; ++i) { 
    1.21  		if (apic_probe[i]->acpi_madt_oem_check(oem_id, oem_table_id)) { 
    1.22 -			genapic = apic_probe[i];
    1.23 -			printk(KERN_INFO "Switched to APIC driver `%s'.\n", 
    1.24 -			       genapic->name);
    1.25 +			if (!cmdline_apic) {
    1.26 +				genapic = apic_probe[i];
    1.27 +				printk(KERN_INFO "Switched to APIC driver `%s'.\n", 
    1.28 +				       genapic->name);
    1.29 +			}
    1.30  			return 1;
    1.31  		} 
    1.32  	}