From 2082ed461a42c689b716cd79edad58b169bb958c Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Thu, 7 Dec 2006 02:14:05 +0100
Subject: [PATCH] --- yaml --- r: 43047 b: refs/heads/master c:
 2fff0a48416af891dce38fd425246e337831e0bb h: refs/heads/master i:   43045:
 af3b55b14750b112d7301f35564214738abc45e5   43043:
 f18f1ffa95f4c2cfe7e13ab6f290ac3ed8a68585   43039:
 1545cce57aa1afc8d5e280821b27e7eab3e726c9 v: v3

---
 [refs]                        | 2 +-
 trunk/include/linux/uaccess.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b6ed6421d3fc..67b147f00f23 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5df0287ecc4f53e68bbd188fa8258b555e6b734f
+refs/heads/master: 2fff0a48416af891dce38fd425246e337831e0bb
diff --git a/trunk/include/linux/uaccess.h b/trunk/include/linux/uaccess.h
index a48d7f11c7be..65a68da8bd5d 100644
--- a/trunk/include/linux/uaccess.h
+++ b/trunk/include/linux/uaccess.h
@@ -36,7 +36,7 @@ static inline unsigned long __copy_from_user_nocache(void *to,
 		long ret;				\
 							\
 		inc_preempt_count();			\
-		ret = __get_user(retval, addr);		\
+		ret = __get_user(retval, (__force typeof(*addr) __user *)addr);\
 		dec_preempt_count();			\
 		ret;					\
 	})