diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-29 16:32:35 -0500 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-29 16:32:35 -0500 |
| commit | 33edcf133ba93ecba2e4b6472e97b689895d805c (patch) | |
| tree | 327d7a20acef64005e7c5ccbfa1265be28aeb6ac /arch/x86/include/asm/uaccess.h | |
| parent | be4d638c1597580ed2294d899d9f1a2cd10e462c (diff) | |
| parent | 3c92ec8ae91ecf59d88c798301833d7cf83f2179 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/x86/include/asm/uaccess.h')
| -rw-r--r-- | arch/x86/include/asm/uaccess.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h index 35c54921b2e4..580c3ee6c58c 100644 --- a/arch/x86/include/asm/uaccess.h +++ b/arch/x86/include/asm/uaccess.h | |||
| @@ -350,14 +350,14 @@ do { \ | |||
| 350 | 350 | ||
| 351 | #define __put_user_nocheck(x, ptr, size) \ | 351 | #define __put_user_nocheck(x, ptr, size) \ |
| 352 | ({ \ | 352 | ({ \ |
| 353 | long __pu_err; \ | 353 | int __pu_err; \ |
| 354 | __put_user_size((x), (ptr), (size), __pu_err, -EFAULT); \ | 354 | __put_user_size((x), (ptr), (size), __pu_err, -EFAULT); \ |
| 355 | __pu_err; \ | 355 | __pu_err; \ |
| 356 | }) | 356 | }) |
| 357 | 357 | ||
| 358 | #define __get_user_nocheck(x, ptr, size) \ | 358 | #define __get_user_nocheck(x, ptr, size) \ |
| 359 | ({ \ | 359 | ({ \ |
| 360 | long __gu_err; \ | 360 | int __gu_err; \ |
| 361 | unsigned long __gu_val; \ | 361 | unsigned long __gu_val; \ |
| 362 | __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \ | 362 | __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \ |
| 363 | (x) = (__force __typeof__(*(ptr)))__gu_val; \ | 363 | (x) = (__force __typeof__(*(ptr)))__gu_val; \ |