summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/setup.c
diff options
context:
space:
mode:
authorYinghai Lu <yhlu.kernel@gmail.com>2008-06-29 00:06:37 -0700
committerIngo Molnar <mingo@elte.hu>2008-07-08 13:16:08 +0200
commit914bebfad42c417b84bda8920a3073d236007fde (patch)
tree03706ce29f8787bf069320db54f37a2e7f333308 /arch/x86/kernel/setup.c
parenta04ad82d0bff4bb564f290eb50982e02458592d9 (diff)
downloadblackbird-op-linux-914bebfad42c417b84bda8920a3073d236007fde.tar.gz
blackbird-op-linux-914bebfad42c417b84bda8920a3073d236007fde.zip
x86: use disable_apic in 32bit
change the enable_local_apic to static force_enable_local_apic for 32bit Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/setup.c')
-rw-r--r--arch/x86/kernel/setup.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 4716460607b4..fb318edd8bc6 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -598,12 +598,8 @@ void __init setup_arch(char **cmdline_p)
if (acpi_mps_check()) {
#ifdef CONFIG_X86_LOCAL_APIC
-#ifdef CONFIG_X86_32
- enable_local_apic = -1;
-#else
disable_apic = 1;
#endif
-#endif
clear_cpu_cap(&boot_cpu_data, X86_FEATURE_APIC);
}
OpenPOWER on IntegriCloud