Skip to contentSkip to conversation

x86: imply 'noapic' from 'nolapic'

PATCH New Jan Beulich 1 participant 1 message Apr 2, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

xen/arch/x86/apic.c +4 -1
@@ -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;
     }