Merge branch 'linus' into core/softlockup

[linux-2.6-omap-h63xx.git] / arch / x86 / lib / copy_user_nocache_64.S

diff --git a/arch/x86/lib/copy_user_nocache_64.S b/arch/x86/lib/copy_user_nocache_64.S
index 93353d6a5263730edacec8f0ab24c7c3cd9248e2..40e0e309d27e8336bca681444c36cf851d5ef286 100644 (file)
--- a/arch/x86/lib/copy_user_nocache_64.S
+++ b/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