Commit c24564a2 authored by Mikael Pettersson's avatar Mikael Pettersson Committed by Linus Torvalds

[PATCH] enable local APIC on P4

The current local APIC code refuses to enable the local APIC
on a P4 if the BIOS booted us with the local APIC disabled.
This patch removes this unnecessary restriction. Please apply.

Most P4 machines do boot with the local APIC enabled, but
Keith Owens reported that the P4 based Compaq Evo N800v
disables the local APIC, even though the machine actually
works if Linux enables it.

It is possible that some P4 machines with broken BIOSen
were saved by our refusal to enable the local APIC. We
can handle them via the DMI blacklist rules instead.
parent b11b6f2c
...@@ -616,7 +616,7 @@ static int __init detect_init_APIC (void) ...@@ -616,7 +616,7 @@ static int __init detect_init_APIC (void)
goto no_apic; goto no_apic;
case X86_VENDOR_INTEL: case X86_VENDOR_INTEL:
if (boot_cpu_data.x86 == 6 || if (boot_cpu_data.x86 == 6 ||
(boot_cpu_data.x86 == 15 && cpu_has_apic) || boot_cpu_data.x86 == 15 ||
(boot_cpu_data.x86 == 5 && cpu_has_apic)) (boot_cpu_data.x86 == 5 && cpu_has_apic))
break; break;
goto no_apic; goto no_apic;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment