diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-05-15 14:35:22 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-05-15 14:35:22 +1000 |
commit | d29a44f0de8842ebcbee98e03851b9c4ad2e8bc1 (patch) | |
tree | cfa5aff4b196cb1e60acd59983c974afebade947 /arch/x86/include/asm/uaccess_32.h | |
parent | 2f46f82a399b887809645d177726c3d882229a7d (diff) | |
parent | 6fe1007b4e681396c4da0c78563a0d3ac33248f4 (diff) |
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
tools/testing/selftests/x86/Makefile
tools/testing/selftests/x86/run_x86_tests.sh
Diffstat (limited to 'arch/x86/include/asm/uaccess_32.h')
-rw-r--r-- | arch/x86/include/asm/uaccess_32.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/include/asm/uaccess_32.h b/arch/x86/include/asm/uaccess_32.h index 3c03a5de64d3..0ed5504c6060 100644 --- a/arch/x86/include/asm/uaccess_32.h +++ b/arch/x86/include/asm/uaccess_32.h @@ -59,6 +59,10 @@ __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n) __put_user_size(*(u32 *)from, (u32 __user *)to, 4, ret, 4); return ret; + case 8: + __put_user_size(*(u64 *)from, (u64 __user *)to, + 8, ret, 8); + return ret; } } return __copy_to_user_ll(to, from, n); |