diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-09-13 00:34:34 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-09-13 00:34:34 -0400 |
commit | eff68d452f1a6842fb05218fd93c774ffc4dbc5a (patch) | |
tree | dacd3bd93b5f9260034bb206d7182c4a2bc6fac0 /include/asm-sh64/uaccess.h | |
parent | 6a9516989f94df10d9a27ba543c6b53b3e69c84a (diff) | |
parent | 95064a75ebf8744e1ff595e8cd7ff9b6c851523e (diff) | |
download | op-kernel-dev-eff68d452f1a6842fb05218fd93c774ffc4dbc5a.zip op-kernel-dev-eff68d452f1a6842fb05218fd93c774ffc4dbc5a.tar.gz |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'include/asm-sh64/uaccess.h')
-rw-r--r-- | include/asm-sh64/uaccess.h | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/include/asm-sh64/uaccess.h b/include/asm-sh64/uaccess.h index f4936d8..644c67b 100644 --- a/include/asm-sh64/uaccess.h +++ b/include/asm-sh64/uaccess.h @@ -128,25 +128,20 @@ do { \ #define __get_user_nocheck(x,ptr,size) \ ({ \ - long __gu_addr = (long)(ptr); \ - long __gu_err; \ - __typeof(*(ptr)) __gu_val; \ - __asm__ ("":"=r" (__gu_val)); \ - __asm__ ("":"=r" (__gu_err)); \ - __get_user_size((void *)&__gu_val, __gu_addr, (size), __gu_err); \ - (x) = (__typeof__(*(ptr))) __gu_val; \ + long __gu_err, __gu_val; \ + __get_user_size((void *)&__gu_val, (long)(ptr), \ + (size), __gu_err); \ + (x) = (__typeof__(*(ptr)))__gu_val; \ __gu_err; \ }) #define __get_user_check(x,ptr,size) \ ({ \ long __gu_addr = (long)(ptr); \ - long __gu_err = -EFAULT; \ - __typeof(*(ptr)) __gu_val; \ - __asm__ ("":"=r" (__gu_val)); \ - __asm__ ("":"=r" (__gu_err)); \ + long __gu_err = -EFAULT, __gu_val; \ if (__access_ok(__gu_addr, (size))) \ - __get_user_size((void *)&__gu_val, __gu_addr, (size), __gu_err); \ + __get_user_size((void *)&__gu_val, __gu_addr, \ + (size), __gu_err); \ (x) = (__typeof__(*(ptr))) __gu_val; \ __gu_err; \ }) |