From: Andrew Morton <akpm@osdl.org>

Cc: Ingo Molnar <mingo@elte.hu>
Cc: Arjan van de Ven <arjan@linux.intel.com>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 include/asm-ia64/percpu.h    |    1 +
 include/asm-powerpc/percpu.h |    1 +
 include/asm-s390/percpu.h    |    1 +
 include/asm-sparc64/percpu.h |    1 +
 4 files changed, 4 insertions(+)

diff -puN include/asm-ia64/percpu.h~lock-validator-add-per_cpu_offset-fix include/asm-ia64/percpu.h
--- devel/include/asm-ia64/percpu.h~lock-validator-add-per_cpu_offset-fix	2006-05-29 18:12:53.000000000 -0700
+++ devel-akpm/include/asm-ia64/percpu.h	2006-05-29 18:12:53.000000000 -0700
@@ -36,6 +36,7 @@
 #ifdef CONFIG_SMP
 
 extern unsigned long __per_cpu_offset[NR_CPUS];
+#define per_cpu_offset(x) (__per_cpu_offset(x))
 
 /* Equal to __per_cpu_offset[smp_processor_id()], but faster to access: */
 DECLARE_PER_CPU(unsigned long, local_per_cpu_offset);
diff -puN include/asm-powerpc/percpu.h~lock-validator-add-per_cpu_offset-fix include/asm-powerpc/percpu.h
--- devel/include/asm-powerpc/percpu.h~lock-validator-add-per_cpu_offset-fix	2006-05-29 18:12:53.000000000 -0700
+++ devel-akpm/include/asm-powerpc/percpu.h	2006-05-29 18:12:53.000000000 -0700
@@ -14,6 +14,7 @@
 
 #define __per_cpu_offset(cpu) (paca[cpu].data_offset)
 #define __my_cpu_offset() get_paca()->data_offset
+#define per_cpu_offset(x) (__per_cpu_offset(x))
 
 /* Separate out the type, so (int[3], foo) works. */
 #define DEFINE_PER_CPU(type, name) \
diff -puN include/asm-s390/percpu.h~lock-validator-add-per_cpu_offset-fix include/asm-s390/percpu.h
--- devel/include/asm-s390/percpu.h~lock-validator-add-per_cpu_offset-fix	2006-05-29 18:12:53.000000000 -0700
+++ devel-akpm/include/asm-s390/percpu.h	2006-05-29 18:12:53.000000000 -0700
@@ -42,6 +42,7 @@ extern unsigned long __per_cpu_offset[NR
 #define __get_cpu_var(var) __reloc_hide(var,S390_lowcore.percpu_offset)
 #define __raw_get_cpu_var(var) __reloc_hide(var,S390_lowcore.percpu_offset)
 #define per_cpu(var,cpu) __reloc_hide(var,__per_cpu_offset[cpu])
+#define per_cpu_offset(x) (__per_cpu_offset[x])
 
 /* A macro to avoid #include hell... */
 #define percpu_modcopy(pcpudst, src, size, zero_size)		\
diff -puN include/asm-sparc64/percpu.h~lock-validator-add-per_cpu_offset-fix include/asm-sparc64/percpu.h
--- devel/include/asm-sparc64/percpu.h~lock-validator-add-per_cpu_offset-fix	2006-05-29 18:12:53.000000000 -0700
+++ devel-akpm/include/asm-sparc64/percpu.h	2006-05-29 18:12:53.000000000 -0700
@@ -11,6 +11,7 @@ extern unsigned long __per_cpu_base;
 extern unsigned long __per_cpu_shift;
 #define __per_cpu_offset(__cpu) \
 	(__per_cpu_base + ((unsigned long)(__cpu) << __per_cpu_shift))
+#define per_cpu_offset(x) (__per_cpu_offset(x))
 
 /* Separate out the type, so (int[3], foo) works. */
 #define DEFINE_PER_CPU(type, name) \
_