From 22bd9388faa1568b84591185670892b552330e5c Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Wed, 12 May 2010 12:10:39 +0200
Subject: [PATCH] --- yaml --- r: 192483 b: refs/heads/master c:
 308eb7add8adaca8088c28a3f7610069b70d1ad6 h: refs/heads/master i:   192481:
 4804a4a026d1f57698b3cb1eba8bdc93b3655e1e   192479:
 69950958dacbe72816f84cb44f98db86be1bc52e v: v3

---
 [refs]                               | 2 +-
 trunk/arch/ia64/include/asm/percpu.h | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

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 <asm-generic/percpu.h>