From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 19 Jan 2009 19:49:37 +0000 (+0100)
Subject: x86: fully honor "nolapic", fix
X-Git-Tag: v2.6.30-rc1~2^2~50^2~66
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=5cdc5e9e69d4dc3a3630ae1fa666401b2a8dcde6;p=~shefty%2Frdma-dev.git

x86: fully honor "nolapic", fix

Impact: build fix

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/arch/x86/kernel/apic.c b/arch/x86/kernel/apic.c
index 48578795583..9ca12af6c87 100644
--- a/arch/x86/kernel/apic.c
+++ b/arch/x86/kernel/apic.c
@@ -1131,7 +1131,9 @@ void __cpuinit setup_local_APIC(void)
 	int i, j;
 
 	if (disable_apic) {
+#ifdef CONFIG_X86_IO_APIC
 		disable_ioapic_setup();
+#endif
 		return;
 	}