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 branches 'stable/ia64', 'stable/blkfront-cleanup' and 'stable/cleanup' of git...
[pandora-kernel.git]
/
arch
/
mn10300
/
include
/
asm
/
uaccess.h
diff --git
a/arch/mn10300/include/asm/uaccess.h
b/arch/mn10300/include/asm/uaccess.h
index
679dee0
..
3d6e60d
100644
(file)
--- a/
arch/mn10300/include/asm/uaccess.h
+++ b/
arch/mn10300/include/asm/uaccess.h
@@
-160,9
+160,10
@@
struct __large_struct { unsigned long buf[100]; };
#define __get_user_check(x, ptr, size) \
({ \
#define __get_user_check(x, ptr, size) \
({ \
+ const __typeof__(ptr) __guc_ptr = (ptr); \
int _e; \
int _e; \
- if (likely(__access_ok((unsigned long)
(ptr), (size))))
\
- _e = __get_user_nocheck((x),
(ptr), (size));
\
+ if (likely(__access_ok((unsigned long)
__guc_ptr, (size))))
\
+ _e = __get_user_nocheck((x),
__guc_ptr, (size));
\
else { \
_e = -EFAULT; \
(x) = (__typeof__(x))0; \
else { \
_e = -EFAULT; \
(x) = (__typeof__(x))0; \