[PATCH 1/5] x86: Do not differentiate between x86_64 and i386 with init_per_cpu

Steven Rostedt
2011-07-29T01:44:04Z

[-- Attachment #1: 0001-x86-Do-not-differentiate-between-x86_64-and-i386-wit.patch --]
[-- Type: text/plain, Size: 1195 bytes --]

From: Steven Rostedt <srostedt@redhat.com>

There's nothing different between the way x86_64 and x86_32
treate init_per_cpu.

Although only x86_64 uses INIT_PER_CPU_VAR() in the head.S file,
there is still no reason to keep the macro x86_64 only.

Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
arch/x86/include/asm/percpu.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/include/asm/percpu.h b/arch/x86/include/asm/percpu.h
index a0a9779..ab86813 100644
--- a/arch/x86/include/asm/percpu.h
+++ b/arch/x86/include/asm/percpu.h
@@ -33,7 +33,7 @@
#define PER_CPU_VAR(var) var
#endif /* SMP */

-#ifdef CONFIG_X86_64_SMP
+#ifdef CONFIG_SMP
#define INIT_PER_CPU_VAR(var) init_per_cpu__##var
#else
#define INIT_PER_CPU_VAR(var) var
@@ -77,7 +77,7 @@
#define DECLARE_INIT_PER_CPU(var) \
extern typeof(var) init_per_cpu_var(var)

-#ifdef CONFIG_X86_64_SMP
+#ifdef CONFIG_SMP
#define init_per_cpu_var(var) init_per_cpu__##var
#else
#define init_per_cpu_var(var) var
--
1.7.5.4