From f26da150c4ddb36365c2144b74b098e30446cfb5 Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Thu, 10 Jul 2008 12:52:52 -0700 Subject: [PATCH] --- yaml --- r: 100112 b: refs/heads/master c: 27cb0a75ba252ea7294d67232c4bbbac3f2b2656 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/lib/copy_user_64.S | 4 ++-- trunk/arch/x86/lib/copy_user_nocache_64.S | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e5dc595f0158..6f76d35111da 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e54afe38630e3b577968428f48ed8ef1e13a2a15 +refs/heads/master: 27cb0a75ba252ea7294d67232c4bbbac3f2b2656 diff --git a/trunk/arch/x86/lib/copy_user_64.S b/trunk/arch/x86/lib/copy_user_64.S index e5afb4ad3f1c..dfdf428975c0 100644 --- a/trunk/arch/x86/lib/copy_user_64.S +++ b/trunk/arch/x86/lib/copy_user_64.S @@ -185,7 +185,7 @@ ENTRY(copy_user_generic_unrolled) 30: shll $6,%ecx addl %ecx,%edx jmp 60f -40: leal (%edx,%ecx,8),%edx +40: lea (%rdx,%rcx,8),%rdx jmp 60f 50: movl %ecx,%edx 60: jmp copy_user_handle_tail /* ecx is zerorest also */ @@ -254,7 +254,7 @@ ENTRY(copy_user_generic_string) ret .section .fixup,"ax" -11: leal (%edx,%ecx,8),%ecx +11: lea (%rdx,%rcx,8),%rcx 12: movl %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 93353d6a5263..40e0e309d27e 100644 --- a/trunk/arch/x86/lib/copy_user_nocache_64.S +++ b/trunk/arch/x86/lib/copy_user_nocache_64.S @@ -104,7 +104,7 @@ ENTRY(__copy_user_nocache) 30: shll $6,%ecx addl %ecx,%edx jmp 60f -40: leal (%edx,%ecx,8),%edx +40: lea (%rdx,%rcx,8),%rdx jmp 60f 50: movl %ecx,%edx 60: sfence