aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86_64/kernel/head64.c
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2006-09-26 04:52:29 -0400
committerAndi Kleen <andi@basil.nowhere.org>2006-09-26 04:52:29 -0400
commit7f11d8a5efd625ffa41cde1d8472f85e885478ec (patch)
tree4f80219fc2153166c89c54d6555498155fa2f3b2 /arch/x86_64/kernel/head64.c
parent5ba5891d44a6acade44887a0f3195489d46c12de (diff)
[PATCH] Remove all ifdefs for local/io apic
IO-APIC or local APIC can only be disabled at runtime anyways and Kconfig has forced these options on for a long time now. The Kconfigs are kept only now for the benefit of the shared acpi boot.c code. Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'arch/x86_64/kernel/head64.c')
-rw-r--r--arch/x86_64/kernel/head64.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86_64/kernel/head64.c b/arch/x86_64/kernel/head64.c
index 36647ce6aecb..bacbd75c63ad 100644
--- a/arch/x86_64/kernel/head64.c
+++ b/arch/x86_64/kernel/head64.c
@@ -111,10 +111,8 @@ void __init x86_64_start_kernel(char * real_mode_data)
111 if (s != NULL) 111 if (s != NULL)
112 numa_setup(s+5); 112 numa_setup(s+5);
113#endif 113#endif
114#ifdef CONFIG_X86_IO_APIC
115 if (strstr(saved_command_line, "disableapic")) 114 if (strstr(saved_command_line, "disableapic"))
116 disable_apic = 1; 115 disable_apic = 1;
117#endif
118 /* You need early console to see that */ 116 /* You need early console to see that */
119 if (__pa_symbol(&_end) >= KERNEL_TEXT_SIZE) 117 if (__pa_symbol(&_end) >= KERNEL_TEXT_SIZE)
120 panic("Kernel too big for kernel mapping\n"); 118 panic("Kernel too big for kernel mapping\n");