Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / arch / x86 / entry / entry_64.S

diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S
index a0c1353a22664ee3f74805285f28745559e8f12d..3166b967442966734b9db6e8fea541f501aa1e1e 100644 (file)
--- a/arch/x86/entry/entry_64.S
+++ b/arch/x86/entry/entry_64.S
@@ -233,7 +233,8 @@ GLOBAL(entry_SYSCALL_64_after_hwframe)
        TRACE_IRQS_OFF
 
        /* IRQs are off. */
-       movq    %rsp, %rdi
+       movq    %rax, %rdi
+       movq    %rsp, %rsi
        call    do_syscall_64           /* returns with IRQs disabled */
 
        TRACE_IRQS_IRETQ                /* we're about to change IF */