ia64/xen-unstable

changeset 19501:085d22289e1b

x86: imply 'noapic' from 'nolapic'

While in the comments to an earlier submitted (and already applied)
patch I claimed to have fixed the need to specify both "nolapic" and
"noapic" when "nolapic" alone should already have the intended effect,
this doesn't appear to be the case. Here are the missing bits.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
author Keir Fraser <keir.fraser@citrix.com>
date Thu Apr 02 13:02:13 2009 +0100 (2009-04-02)
parents 59fff20323b1
children 5a60eb7fad79
files xen/arch/x86/apic.c
line diff
     1.1 --- a/xen/arch/x86/apic.c	Thu Apr 02 12:40:44 2009 +0100
     1.2 +++ b/xen/arch/x86/apic.c	Thu Apr 02 13:02:13 2009 +0100
     1.3 @@ -1303,8 +1303,10 @@ int __init APIC_init_uniprocessor (void)
     1.4      if (enable_local_apic < 0)
     1.5          clear_bit(X86_FEATURE_APIC, boot_cpu_data.x86_capability);
     1.6  
     1.7 -    if (!smp_found_config && !cpu_has_apic)
     1.8 +    if (!smp_found_config && !cpu_has_apic) {
     1.9 +        skip_ioapic_setup = 1;
    1.10          return -1;
    1.11 +    }
    1.12  
    1.13      /*
    1.14       * Complain if the BIOS pretends there is one.
    1.15 @@ -1313,6 +1315,7 @@ int __init APIC_init_uniprocessor (void)
    1.16          printk(KERN_ERR "BIOS bug, local APIC #%d not detected!...\n",
    1.17                 boot_cpu_physical_apicid);
    1.18          clear_bit(X86_FEATURE_APIC, boot_cpu_data.x86_capability);
    1.19 +        skip_ioapic_setup = 1;
    1.20          return -1;
    1.21      }
    1.22