From d530fa797e0c6c7029b0b112f9b7cbc32076d108 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@ftp.linux.org.uk>
Date: Wed, 11 Oct 2006 17:22:54 +0100
Subject: [PATCH] --- yaml --- r: 39378 b: refs/heads/master c:
 fc048b5b0f2554bc953a8ada5b2e3b82bde2fcb0 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index f8ce68fe2d6c..4f9e25e5613f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35d59fc5d6f318a28a99c5936171afd4edef28c8
+refs/heads/master: fc048b5b0f2554bc953a8ada5b2e3b82bde2fcb0
diff --git a/trunk/include/asm-arm/uaccess.h b/trunk/include/asm-arm/uaccess.h
index 87aba57a66c4..09ad0cab9014 100644
--- a/trunk/include/asm-arm/uaccess.h
+++ b/trunk/include/asm-arm/uaccess.h
@@ -110,7 +110,7 @@ extern int __get_user_4(void *);
 #define get_user(x,p)							\
 	({								\
 		const register typeof(*(p)) __user *__p asm("r0") = (p);\
-		register unsigned int __r2 asm("r2");			\
+		register unsigned long __r2 asm("r2");			\
 		register int __e asm("r0");				\
 		switch (sizeof(*(__p))) {				\
 		case 1:							\