[ACPI] If BIOS disabled the LAPIC, believe it by default.

"lapic" is available to force enabling the LAPIC
in the event you know more than your BIOS vendor.
http://bugzilla.kernel.org/show_bug.cgi?id=3238

diff --git a/arch/i386/kernel/apic.c b/arch/i386/kernel/apic.c
index 8042a1472501e4a79c77c6b2a3b2c42917cef6de..64c175ff4a9228c1cd68564ad335eaf55e0f61ec 100644 (file)
--- a/arch/i386/kernel/apic.c
+++ b/arch/i386/kernel/apic.c
@@ -691,6 +691,12 @@ static int __init detect_init_APIC (void)
        }
 
        if (!cpu_has_apic) {
+               /*
+                * Over-ride BIOS and try to enable LAPIC
+                * only if "lapic" specified
+                */
+               if (enable_local_apic != 1)
+                       goto no_apic;
                /*
                 * Some BIOSes disable the local APIC in the
                 * APIC_BASE MSR. This can only be done in