[Xen-changelog] [xen-unstable] x86: imply 'noapic' from 'nolapic'

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1238673733 -3600
# Node ID 085d22289e1b078f6bee808eb14209ca91c58451
# Parent  59fff20323b1fc1447bd228c1c7f5590aaead210
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@xxxxxxxxxx>
---
 xen/arch/x86/apic.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

diff -r 59fff20323b1 -r 085d22289e1b xen/arch/x86/apic.c
--- a/xen/arch/x86/apic.c       Thu Apr 02 12:40:44 2009 +0100
+++ b/xen/arch/x86/apic.c       Thu Apr 02 13:02:13 2009 +0100
@@ -1303,8 +1303,10 @@ int __init APIC_init_uniprocessor (void)
     if (enable_local_apic < 0)
         clear_bit(X86_FEATURE_APIC, boot_cpu_data.x86_capability);
 
-    if (!smp_found_config && !cpu_has_apic)
+    if (!smp_found_config && !cpu_has_apic) {
+        skip_ioapic_setup = 1;
         return -1;
+    }
 
     /*
      * Complain if the BIOS pretends there is one.
@@ -1313,6 +1315,7 @@ int __init APIC_init_uniprocessor (void)
         printk(KERN_ERR "BIOS bug, local APIC #%d not detected!...\n",
                boot_cpu_physical_apicid);
         clear_bit(X86_FEATURE_APIC, boot_cpu_data.x86_capability);
+        skip_ioapic_setup = 1;
         return -1;
     }
 

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