diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-20 16:09:32 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-20 16:09:32 -0500 |
| commit | 0260da162fa12c899b4377e71c243a631438c148 (patch) | |
| tree | 0c3f8a6b4d5d911a86a1c4c9362935a3b4b13107 /arch/x86/include | |
| parent | ed79b86d8acf1f3d3bb83f04dc216c8dfa1d5970 (diff) | |
| parent | 20a4a236c7de5c915551cdc562482aa53eaff40e (diff) | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: uaccess_64: fix return value in __copy_from_user()
x86: quirk for reboot stalls on a Dell Optiplex 330
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/uaccess_64.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h index 664f15280f14..f8cfd00db450 100644 --- a/arch/x86/include/asm/uaccess_64.h +++ b/arch/x86/include/asm/uaccess_64.h | |||
| @@ -46,7 +46,7 @@ int __copy_from_user(void *dst, const void __user *src, unsigned size) | |||
| 46 | return ret; | 46 | return ret; |
| 47 | case 10: | 47 | case 10: |
| 48 | __get_user_asm(*(u64 *)dst, (u64 __user *)src, | 48 | __get_user_asm(*(u64 *)dst, (u64 __user *)src, |
| 49 | ret, "q", "", "=r", 16); | 49 | ret, "q", "", "=r", 10); |
| 50 | if (unlikely(ret)) | 50 | if (unlikely(ret)) |
| 51 | return ret; | 51 | return ret; |
| 52 | __get_user_asm(*(u16 *)(8 + (char *)dst), | 52 | __get_user_asm(*(u16 *)(8 + (char *)dst), |