From f6ca7f0949f50791b6e1d6243cf82448cd0733d9 Mon Sep 17 00:00:00 2001 From: Hiroshi Shimamoto Date: Thu, 13 Nov 2008 18:06:04 -0800 Subject: [PATCH] --- yaml --- r: 119226 b: refs/heads/master c: 20a4a236c7de5c915551cdc562482aa53eaff40e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/include/asm/uaccess_64.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 234d2d66e884..0b75eb2038cd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 093bac154c142fa1fb31a3ac69ae1bc08930231b +refs/heads/master: 20a4a236c7de5c915551cdc562482aa53eaff40e diff --git a/trunk/arch/x86/include/asm/uaccess_64.h b/trunk/arch/x86/include/asm/uaccess_64.h index 664f15280f14..f8cfd00db450 100644 --- a/trunk/arch/x86/include/asm/uaccess_64.h +++ b/trunk/arch/x86/include/asm/uaccess_64.h @@ -46,7 +46,7 @@ int __copy_from_user(void *dst, const void __user *src, unsigned size) return ret; case 10: __get_user_asm(*(u64 *)dst, (u64 __user *)src, - ret, "q", "", "=r", 16); + ret, "q", "", "=r", 10); if (unlikely(ret)) return ret; __get_user_asm(*(u16 *)(8 + (char *)dst),