From 05fa8e6a9b46215945e5c6ccf7c7ca50e0d6cf52 Mon Sep 17 00:00:00 2001 From: Vitaly Mayatskikh Date: Wed, 30 Jul 2008 13:30:14 +0200 Subject: [PATCH] --- yaml --- r: 107076 b: refs/heads/master c: afd962a9e8708c571c5c0c4a6d098f931742c229 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/lib/copy_user_64.S | 2 +- trunk/arch/x86/lib/copy_user_nocache_64.S | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index bf46e60580ba..578303b92d56 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bd3e64c1759e4930315ebf022611468ee9621486 +refs/heads/master: afd962a9e8708c571c5c0c4a6d098f931742c229 diff --git a/trunk/arch/x86/lib/copy_user_64.S b/trunk/arch/x86/lib/copy_user_64.S index dfdf428975c0..f118c110af32 100644 --- a/trunk/arch/x86/lib/copy_user_64.S +++ b/trunk/arch/x86/lib/copy_user_64.S @@ -52,7 +52,7 @@ jnz 100b 102: .section .fixup,"ax" -103: addl %r8d,%edx /* ecx is zerorest also */ +103: addl %ecx,%edx /* ecx is zerorest also */ jmp copy_user_handle_tail .previous diff --git a/trunk/arch/x86/lib/copy_user_nocache_64.S b/trunk/arch/x86/lib/copy_user_nocache_64.S index 40e0e309d27e..cb0c112386fb 100644 --- a/trunk/arch/x86/lib/copy_user_nocache_64.S +++ b/trunk/arch/x86/lib/copy_user_nocache_64.S @@ -32,7 +32,7 @@ jnz 100b 102: .section .fixup,"ax" -103: addl %r8d,%edx /* ecx is zerorest also */ +103: addl %ecx,%edx /* ecx is zerorest also */ jmp copy_user_handle_tail .previous @@ -108,7 +108,6 @@ ENTRY(__copy_user_nocache) jmp 60f 50: movl %ecx,%edx 60: sfence - movl %r8d,%ecx jmp copy_user_handle_tail .previous