From dd802e61ac943b313fd626e130ff1b6e6c7916d2 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Thu, 29 Sep 2005 00:17:49 +0100
Subject: [PATCH] --- yaml --- r: 9419 b: refs/heads/master c:
 ea8a918eb71b503be13b861dbe18b93932fd6b62 h: refs/heads/master i:   9417:
 c02988595d03fde7e80f8f926489f1efce416243   9415:
 e9b546de31d440b48e97195abf0de6d1eec41608 v: v3

---
 [refs]                            | 2 +-
 trunk/include/asm-ppc64/uaccess.h | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index fbb85db0ea6a..ba9cbba0562b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c28144763a7dcdceb2c16a5ac9c8e0022d547d28
+refs/heads/master: ea8a918eb71b503be13b861dbe18b93932fd6b62
diff --git a/trunk/include/asm-ppc64/uaccess.h b/trunk/include/asm-ppc64/uaccess.h
index c181a60d868c..132c1276547b 100644
--- a/trunk/include/asm-ppc64/uaccess.h
+++ b/trunk/include/asm-ppc64/uaccess.h
@@ -164,7 +164,8 @@ do {									\
 
 #define __get_user_nocheck(x,ptr,size)				\
 ({								\
-	long __gu_err, __gu_val;				\
+	long __gu_err;						\
+	unsigned long __gu_val;					\
 	might_sleep();						\
 	__get_user_size(__gu_val,(ptr),(size),__gu_err,-EFAULT);\
 	(x) = (__typeof__(*(ptr)))__gu_val;			\
@@ -173,7 +174,8 @@ do {									\
 
 #define __get_user_check(x,ptr,size)					\
 ({									\
-	long __gu_err = -EFAULT, __gu_val = 0;				\
+	long __gu_err = -EFAULT;					\
+	unsigned long __gu_val = 0;					\
 	const __typeof__(*(ptr)) __user *__gu_addr = (ptr);		\
 	might_sleep();							\
 	if (access_ok(VERIFY_READ,__gu_addr,size))			\