diff --git a/[refs] b/[refs] index aea42072d5b8..108b3112e916 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b0c9778b1d07ed3aa7e411db201275553527b1b1 +refs/heads/master: 308eb7add8adaca8088c28a3f7610069b70d1ad6 diff --git a/trunk/arch/ia64/include/asm/percpu.h b/trunk/arch/ia64/include/asm/percpu.h index f7c00a5e0e2b..1bd408265694 100644 --- a/trunk/arch/ia64/include/asm/percpu.h +++ b/trunk/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