From: Glauber Costa <gcosta@redhat.com>
Date: Thu, 27 Mar 2008 17:05:59 +0000 (-0300)
Subject: x86: surround apic headers in apic definitions
X-Git-Tag: v2.6.26-rc1~1154^2~72
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1fa6c977eb978e1d09867475ec59c9a5799127f;p=linux-2.6

x86: surround apic headers in apic definitions

Although those constants are always defined in x86_64,
and will have the effect of just including the headers
in the very way we did before, I'm doing this in a separate
patch to be conservative and avoid surprises.

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/include/asm-x86/smp_64.h b/include/asm-x86/smp_64.h
index 015d36e29a..b83151d738 100644
--- a/include/asm-x86/smp_64.h
+++ b/include/asm-x86/smp_64.h
@@ -7,9 +7,13 @@
 /*
  * We need the APIC definitions automatically as part of 'smp.h'
  */
-#include <asm/apic.h>
-#include <asm/io_apic.h>
-#include <asm/mpspec.h>
+#ifdef CONFIG_X86_LOCAL_APIC
+#  include <asm/mpspec.h>
+#  include <asm/apic.h>
+#  ifdef CONFIG_X86_IO_APIC
+#   include <asm/io_apic.h>
+#  endif
+#endif
 #include <asm/pda.h>
 #include <asm/thread_info.h>