From: Glauber Costa <gcosta@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: akpm@linux-foundation.org, glommer@gmail.com, mingo@elte.hu,
tglx@linutronix.de, Glauber Costa <gcosta@redhat.com>
Subject: [PATCH 4/9] [PATCH] x86: surround apic headers in apic definitions
Date: Thu, 27 Mar 2008 14:05:59 -0300 [thread overview]
Message-ID: <1206637582638-git-send-email-gcosta@redhat.com> (raw)
In-Reply-To: <12066375644061-git-send-email-gcosta@redhat.com>
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
next prev parent reply other threads:[~2008-03-27 17:13 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-03-27 17:05 [PATCH 0/9] integrate smp.h Glauber Costa
2008-03-27 17:05 ` [PATCH 1/9] [PATCH] x86: surround hard_smp_processor_id in APIC_DEFINITION Glauber Costa
2008-03-27 17:05 ` [PATCH 2/9] [PATCH] x86: provide bogus hard_smp_processor_id Glauber Costa
2008-03-27 17:05 ` [PATCH 3/9] [PATCH] x86: merge hard/logical_smp_processor_id Glauber Costa
2008-03-27 17:05 ` Glauber Costa [this message]
2008-03-27 17:06 ` [PATCH 5/9] [PATCH] x86: merge includes in smp.h Glauber Costa
2008-03-27 17:06 ` [PATCH 6/9] [PATCH] x86: split safe_smp_processor_id Glauber Costa
2008-03-27 17:06 ` [PATCH 7/9] [PATCH] x86: merge SMP definitions of smp.h Glauber Costa
2008-03-27 17:06 ` [PATCH 8/9] [PATCH] x86: change naming of cpu_initialized_mask for xen Glauber Costa
2008-03-27 17:06 ` [PATCH 9/9] [PATCH] x86: merge smp_32.h and smp_64.h into smp.h Glauber Costa
2008-03-28 9:07 ` [PATCH 0/9] integrate smp.h Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1206637582638-git-send-email-gcosta@redhat.com \
--to=gcosta@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=glommer@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox