git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[pandora-kernel.git]
/
include
/
asm-arm
/
uaccess.h
diff --git
a/include/asm-arm/uaccess.h
b/include/asm-arm/uaccess.h
index
87aba57
..
09ad0ca
100644
(file)
--- a/
include/asm-arm/uaccess.h
+++ b/
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: \