From dcc676ebb867eac33399447a0467bf18aca16c47 Mon Sep 17 00:00:00 2001
From: Lars-Peter Clausen <lars@metafoo.de>
Date: Mon, 22 Oct 2012 16:09:03 +0200
Subject: [PATCH] --- yaml --- r: 346851 b: refs/heads/master c:
 aff06631da3c8349149fe4214091735b35294151 h: refs/heads/master i:   346849:
 f2492819dddb271bf23673192d4e94e32052a35a   346847:
 88cde32c335e108591d06bfa14a3e33999132234 v: v3

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

diff --git a/[refs] b/[refs]
index cca7d0648e80..e9fda01577d6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d95dcaa06ba895ec379d80b35c25ddba3a71943a
+refs/heads/master: aff06631da3c8349149fe4214091735b35294151
diff --git a/trunk/arch/blackfin/include/asm/uaccess.h b/trunk/arch/blackfin/include/asm/uaccess.h
index 3edb4afa3053..90f32c2a65bb 100644
--- a/trunk/arch/blackfin/include/asm/uaccess.h
+++ b/trunk/arch/blackfin/include/asm/uaccess.h
@@ -89,7 +89,7 @@ struct exception_table_entry {
 	({							\
 		int _err = 0;					\
 		typeof(*(p)) _x = (x);				\
-		typeof(*(p)) *_p = (p);				\
+		typeof(*(p)) __user *_p = (p);				\
 		if (!access_ok(VERIFY_WRITE, _p, sizeof(*(_p)))) {\
 			_err = -EFAULT;				\
 		}						\
@@ -108,8 +108,8 @@ struct exception_table_entry {
 			long _xl, _xh;				\
 			_xl = ((long *)&_x)[0];			\
 			_xh = ((long *)&_x)[1];			\
-			__put_user_asm(_xl, ((long *)_p)+0, );	\
-			__put_user_asm(_xh, ((long *)_p)+1, );	\
+			__put_user_asm(_xl, ((long __user *)_p)+0, );	\
+			__put_user_asm(_xh, ((long __user *)_p)+1, );	\
 		} break;					\
 		default:					\
 			_err = __put_user_bad();		\
@@ -136,7 +136,7 @@ static inline int bad_user_access_length(void)
  * aliasing issues.
  */
 
-#define __ptr(x) ((unsigned long *)(x))
+#define __ptr(x) ((unsigned long __force *)(x))
 
 #define __put_user_asm(x,p,bhw)				\
 	__asm__ (#bhw"[%1] = %0;\n\t"			\