Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[pandora-kernel.git] / arch / ia64 / include / asm / percpu.h

diff --git a/arch/ia64/include/asm/percpu.h b/arch/ia64/include/asm/percpu.h
index f7c00a5..1bd4082 100644 (file)
--- a/arch/ia64/include/asm/percpu.h
+++ b/arch/ia64/include/asm/percpu.h
@@ -39,7 +39,10 @@ extern void *per_cpu_init(void);
  * On the positive side, using __ia64_per_cpu_var() instead of __get_cpu_var() is slightly
  * more efficient.
  */
-#define __ia64_per_cpu_var(var)        var
+#define __ia64_per_cpu_var(var) (*({                                   \
+       __verify_pcpu_ptr(&(var));                                      \
+       ((typeof(var) __kernel __force *)&(var));                       \
+}))
 
 #include <asm-generic/percpu.h>