Merge commit 'v2.6.28-rc7' into core/locking
[sfrench/cifs-2.6.git] / arch / x86 / include / asm / uaccess_64.h
index 543ba883cc66200ff0e2206aec36b434b63d3695..84210c479fca83524c6cef4c6bc069bcff76e272 100644 (file)
@@ -48,7 +48,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,
                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),
                if (unlikely(ret))
                        return ret;
                __get_user_asm(*(u16 *)(8 + (char *)dst),