Home » Mailing list archives » linux-kernel » 2008 » March » 27

[PATCH 4/9] [PATCH] x86: surround apic headers in apic definitions

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Glauber Costa <gcosta@...>
To: <linux-kernel@...>
Cc: <akpm@...>, <glommer@...>, <mingo@...>, <tglx@...>, Glauber Costa <gcosta@...>
Subject: [PATCH 4/9] [PATCH] x86: surround apic headers in apic definitions
Date: Thursday, March 27, 2008 - 1:05 pm

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>
---
 include/asm-x86/smp_64.h |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/include/asm-x86/smp_64.h b/include/asm-x86/smp_64.h
index 015d36e..b83151d 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>
 
-- 
1.5.0.6

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH 0/9] integrate smp.h, Glauber Costa, (Thu Mar 27, 1:05 pm)
Re: [PATCH 0/9] integrate smp.h, Ingo Molnar, (Fri Mar 28, 5:07 am)
[PATCH 6/9] [PATCH] x86: split safe_smp_processor_id, Glauber Costa, (Thu Mar 27, 1:06 pm)
[PATCH 4/9] [PATCH] x86: surround apic headers in apic defin..., Glauber Costa, (Thu Mar 27, 1:05 pm)
[PATCH 5/9] [PATCH] x86: merge includes in smp.h, Glauber Costa, (Thu Mar 27, 1:06 pm)
[PATCH 3/9] [PATCH] x86: merge hard/logical_smp_processor_id, Glauber Costa, (Thu Mar 27, 1:05 pm)
[PATCH 2/9] [PATCH] x86: provide bogus hard_smp_processor_id, Glauber Costa, (Thu Mar 27, 1:05 pm)
[PATCH 1/9] [PATCH] x86: surround hard_smp_processor_id in A..., Glauber Costa, (Thu Mar 27, 1:05 pm)
[PATCH 9/9] [PATCH] x86: merge smp_32.h and smp_64.h into sm..., Glauber Costa, (Thu Mar 27, 1:06 pm)
[PATCH 8/9] [PATCH] x86: change naming of cpu_initialized_ma..., Glauber Costa, (Thu Mar 27, 1:06 pm)
[PATCH 7/9] [PATCH] x86: merge SMP definitions of smp.h, Glauber Costa, (Thu Mar 27, 1:06 pm)