aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-01-19 14:49:37 -0500
committerIngo Molnar <mingo@elte.hu>2009-01-19 14:49:37 -0500
commit5cdc5e9e69d4dc3a3630ae1fa666401b2a8dcde6 (patch)
tree62032100bc8fb814f4c7b76c327144d5254ebfa3 /arch/x86/kernel
parent7890ba8c87604ca4c2c73f7de846bf5305d743e4 (diff)
x86: fully honor "nolapic", fix
Impact: build fix Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r--arch/x86/kernel/apic.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/apic.c b/arch/x86/kernel/apic.c
index 485787955834..9ca12af6c876 100644
--- a/arch/x86/kernel/apic.c
+++ b/arch/x86/kernel/apic.c
@@ -1131,7 +1131,9 @@ void __cpuinit setup_local_APIC(void)
1131 int i, j; 1131 int i, j;
1132 1132
1133 if (disable_apic) { 1133 if (disable_apic) {
1134#ifdef CONFIG_X86_IO_APIC
1134 disable_ioapic_setup(); 1135 disable_ioapic_setup();
1136#endif
1135 return; 1137 return;
1136 } 1138 }
1137 1139