diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2017-05-27 16:22:20 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2017-05-27 16:22:20 -0400 |
| commit | 33dd955df2d35bfca0fc851bcde9189839eb687a (patch) | |
| tree | a06379ac5a9df04f03c8a150b58e79a5a8e69e88 /arch/x86/include/asm/uaccess.h | |
| parent | 9ba3eb5103cf56f0daaf07de4507df76e7813ed7 (diff) | |
| parent | 92ebce5ac55dba258c608248dddf59eca3f7f514 (diff) | |
| download | linux-33dd955df2d35bfca0fc851bcde9189839eb687a.tar.gz linux-33dd955df2d35bfca0fc851bcde9189839eb687a.tar.bz2 linux-33dd955df2d35bfca0fc851bcde9189839eb687a.zip | |
Merge branch 'work.sys_wait' into misc.alpha
Diffstat (limited to 'arch/x86/include/asm/uaccess.h')
| -rw-r--r-- | arch/x86/include/asm/uaccess.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h index 68766b276d9e..d9668c3beb5b 100644 --- a/arch/x86/include/asm/uaccess.h +++ b/arch/x86/include/asm/uaccess.h @@ -703,7 +703,7 @@ extern struct movsl_mask { #define unsafe_put_user(x, ptr, err_label) \ do { \ int __pu_err; \ - __put_user_size((x), (ptr), sizeof(*(ptr)), __pu_err, -EFAULT); \ + __put_user_size((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)), __pu_err, -EFAULT); \ if (unlikely(__pu_err)) goto err_label; \ } while (0) |