---
 include/asm-generic/percpu.h |    2 +-
 include/linux/percpu.h       |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

Index: linux-2.6/include/asm-generic/percpu.h
===================================================================
--- linux-2.6.orig/include/asm-generic/percpu.h	2007-11-22 18:06:14.701455065 -0800
+++ linux-2.6/include/asm-generic/percpu.h	2007-11-22 18:06:45.361204640 -0800
@@ -43,7 +43,7 @@ extern unsigned long __per_cpu_offset[NR
  * Determine the real variable name from the name visible in the
  * kernel sources.
  */
-#define per_cpu_var(var) per_cpu__##var
+#define per_cpu_var(var) cpu_##var
 
 /*
  * A percpu variable may point to a discarded reghions. The following are
Index: linux-2.6/include/linux/percpu.h
===================================================================
--- linux-2.6.orig/include/linux/percpu.h	2007-11-22 18:07:13.385204922 -0800
+++ linux-2.6/include/linux/percpu.h	2007-11-22 18:08:44.293364110 -0800
@@ -11,20 +11,20 @@
 
 #define DEFINE_PER_CPU(type, name)					\
 	 __attribute__((__section__(".data.percpu")))			\
-	__typeof__(type) per_cpu__##name
+	__typeof__(type) per_cpu_var(name)
 
 #ifdef CONFIG_SMP
 #define DEFINE_PER_CPU_SHARED_ALIGNED(type, name)			\
 	__attribute__((__section__(".data.percpu.shared_aligned")))	\
-	__typeof__(type) per_cpu__##name				\
+	__typeof__(type) per_cpu_var(name)				\
 	____cacheline_aligned_in_smp
 #else
 #define DEFINE_PER_CPU_SHARED_ALIGNED(type, name)		      \
 	DEFINE_PER_CPU(type, name)
 #endif
 
-#define EXPORT_PER_CPU_SYMBOL(var) EXPORT_SYMBOL(per_cpu__##var)
-#define EXPORT_PER_CPU_SYMBOL_GPL(var) EXPORT_SYMBOL_GPL(per_cpu__##var)
+#define EXPORT_PER_CPU_SYMBOL(var) EXPORT_SYMBOL(per_cpu_var(var))
+#define EXPORT_PER_CPU_SYMBOL_GPL(var) EXPORT_SYMBOL_GPL(per_cpu_var(var))
 
 /* Enough to cover all DEFINE_PER_CPUs in kernel, including modules. */
 #ifndef PERCPU_ENOUGH_ROOM