diff options
Diffstat (limited to 'include/asm-ppc64/uaccess.h')
| -rw-r--r-- | include/asm-ppc64/uaccess.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/asm-ppc64/uaccess.h b/include/asm-ppc64/uaccess.h index c181a60d868c..132c1276547b 100644 --- a/include/asm-ppc64/uaccess.h +++ b/include/asm-ppc64/uaccess.h | |||
| @@ -164,7 +164,8 @@ do { \ | |||
| 164 | 164 | ||
| 165 | #define __get_user_nocheck(x,ptr,size) \ | 165 | #define __get_user_nocheck(x,ptr,size) \ |
| 166 | ({ \ | 166 | ({ \ |
| 167 | long __gu_err, __gu_val; \ | 167 | long __gu_err; \ |
| 168 | unsigned long __gu_val; \ | ||
| 168 | might_sleep(); \ | 169 | might_sleep(); \ |
| 169 | __get_user_size(__gu_val,(ptr),(size),__gu_err,-EFAULT);\ | 170 | __get_user_size(__gu_val,(ptr),(size),__gu_err,-EFAULT);\ |
| 170 | (x) = (__typeof__(*(ptr)))__gu_val; \ | 171 | (x) = (__typeof__(*(ptr)))__gu_val; \ |
| @@ -173,7 +174,8 @@ do { \ | |||
| 173 | 174 | ||
| 174 | #define __get_user_check(x,ptr,size) \ | 175 | #define __get_user_check(x,ptr,size) \ |
| 175 | ({ \ | 176 | ({ \ |
| 176 | long __gu_err = -EFAULT, __gu_val = 0; \ | 177 | long __gu_err = -EFAULT; \ |
| 178 | unsigned long __gu_val = 0; \ | ||
| 177 | const __typeof__(*(ptr)) __user *__gu_addr = (ptr); \ | 179 | const __typeof__(*(ptr)) __user *__gu_addr = (ptr); \ |
| 178 | might_sleep(); \ | 180 | might_sleep(); \ |
| 179 | if (access_ok(VERIFY_READ,__gu_addr,size)) \ | 181 | if (access_ok(VERIFY_READ,__gu_addr,size)) \ |