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 5/9] [PATCH] x86: merge includes in smp.h
Date: Thu, 27 Mar 2008 14:06:00 -0300 [thread overview]
Message-ID: <12066375851799-git-send-email-gcosta@redhat.com> (raw)
In-Reply-To: <12066375644061-git-send-email-gcosta@redhat.com>
move all include directives from smp_{32,64}.h to smp.h.
Signed-off-by: Glauber Costa <gcosta@redhat.com>
---
include/asm-x86/smp.h | 13 +++++++++++++
include/asm-x86/smp_32.h | 13 -------------
include/asm-x86/smp_64.h | 16 ----------------
3 files changed, 13 insertions(+), 29 deletions(-)
diff --git a/include/asm-x86/smp.h b/include/asm-x86/smp.h
index eb05804..1cd434d 100644
--- a/include/asm-x86/smp.h
+++ b/include/asm-x86/smp.h
@@ -5,6 +5,19 @@
#include <linux/init.h>
#include <asm/percpu.h>
+/*
+ * We need the APIC definitions automatically as part of 'smp.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>
+
extern cpumask_t cpu_callout_map;
extern int smp_num_siblings;
diff --git a/include/asm-x86/smp_32.h b/include/asm-x86/smp_32.h
index 53432db..694d324 100644
--- a/include/asm-x86/smp_32.h
+++ b/include/asm-x86/smp_32.h
@@ -2,19 +2,6 @@
#define __ASM_SMP_H
#ifndef __ASSEMBLY__
-#include <linux/cpumask.h>
-#include <linux/init.h>
-
-/*
- * We need the APIC definitions automatically as part of 'smp.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
extern cpumask_t cpu_callin_map;
diff --git a/include/asm-x86/smp_64.h b/include/asm-x86/smp_64.h
index b83151d..eead92e 100644
--- a/include/asm-x86/smp_64.h
+++ b/include/asm-x86/smp_64.h
@@ -1,22 +1,6 @@
#ifndef __ASM_SMP_H
#define __ASM_SMP_H
-#include <linux/cpumask.h>
-#include <linux/init.h>
-
-/*
- * We need the APIC definitions automatically as part of 'smp.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>
-
extern cpumask_t cpu_initialized;
extern cpumask_t cpu_callin_map;
--
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 ` [PATCH 4/9] [PATCH] x86: surround apic headers in apic definitions Glauber Costa
2008-03-27 17:06 ` Glauber Costa [this message]
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=12066375851799-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.