diff --git a/[refs] b/[refs]
index 2a2b6453ec2d..57c6be3bb761 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 18fbef9e5242e146fe0264cf719a498785102841
+refs/heads/master: ab6e14b712e2d8e0c4dd3cf1a72083b52104853a
diff --git a/trunk/include/asm-ia64/percpu.h b/trunk/include/asm-ia64/percpu.h
index 26404b77f007..77f30b664b4e 100644
--- a/trunk/include/asm-ia64/percpu.h
+++ b/trunk/include/asm-ia64/percpu.h
@@ -15,18 +15,20 @@
 
 #include <linux/threads.h>
 
+#ifdef CONFIG_SMP
+
 #ifdef HAVE_MODEL_SMALL_ATTRIBUTE
 # define PER_CPU_ATTRIBUTES	__attribute__((__model__ (__small__)))
 #endif
 
-#ifdef CONFIG_SMP
-
 #define __my_cpu_offset	__ia64_per_cpu_var(local_per_cpu_offset)
 
 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 */