From 14682114c08c2b14e1f2a900489d660bccc61165 Mon Sep 17 00:00:00 2001
From: Brian Gerst <brgerst@gmail.com>
Date: Sun, 8 Feb 2009 09:58:38 -0500
Subject: [PATCH] --- yaml --- r: 136745 b: refs/heads/master c:
 d3770449d3cb058b94ca1d050d5ced4a66c75ce4 h: refs/heads/master i:   136743:
 0ba298d5de7b250d697cb8becb8c181025e9fd2a v: v3

---
 [refs]                               | 2 +-
 trunk/arch/ia64/include/asm/percpu.h | 4 ++--
 trunk/include/linux/percpu.h         | 8 +++++++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index b828ae7bb3fb..6b06c6a7936f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 56fc82c5360cdf0b250b5eb74f38657b0402faa5
+refs/heads/master: d3770449d3cb058b94ca1d050d5ced4a66c75ce4
diff --git a/trunk/arch/ia64/include/asm/percpu.h b/trunk/arch/ia64/include/asm/percpu.h
index 77f30b664b4e..30cf46534dd2 100644
--- a/trunk/arch/ia64/include/asm/percpu.h
+++ b/trunk/arch/ia64/include/asm/percpu.h
@@ -27,12 +27,12 @@ extern void *per_cpu_init(void);
 
 #else /* ! SMP */
 
-#define PER_CPU_ATTRIBUTES	__attribute__((__section__(".data.percpu")))
-
 #define per_cpu_init()				(__phys_per_cpu_start)
 
 #endif	/* SMP */
 
+#define PER_CPU_BASE_SECTION ".data.percpu"
+
 /*
  * Be extremely careful when taking the address of this variable!  Due to virtual
  * remapping, it is different from the canonical address returned by __get_cpu_var(var)!
diff --git a/trunk/include/linux/percpu.h b/trunk/include/linux/percpu.h
index 0e24202b5a4e..3577ffd90d45 100644
--- a/trunk/include/linux/percpu.h
+++ b/trunk/include/linux/percpu.h
@@ -8,8 +8,15 @@
 
 #include <asm/percpu.h>
 
+#ifndef PER_CPU_BASE_SECTION
 #ifdef CONFIG_SMP
 #define PER_CPU_BASE_SECTION ".data.percpu"
+#else
+#define PER_CPU_BASE_SECTION ".data"
+#endif
+#endif
+
+#ifdef CONFIG_SMP
 
 #ifdef MODULE
 #define PER_CPU_SHARED_ALIGNED_SECTION ""
@@ -20,7 +27,6 @@
 
 #else
 
-#define PER_CPU_BASE_SECTION ".data"
 #define PER_CPU_SHARED_ALIGNED_SECTION ""
 #define PER_CPU_FIRST_SECTION ""