x86/asm/entry/32: Replace RESTORE_RSI_RDI with open-coded 32-bit reads

[deliverable/linux.git] / arch / x86 / entry / entry_64_compat.S

diff --git a/arch/x86/entry/entry_64_compat.S b/arch/x86/entry/entry_64_compat.S
index bb187a6a877cc62666afb43421eb7e5e8b6fbbfe..b868cfc7298527a600cd8a695bd03e64ddcdbd97 100644 (file)
--- a/arch/x86/entry/entry_64_compat.S
+++ b/arch/x86/entry/entry_64_compat.S
@@ -140,7 +140,8 @@ sysexit_from_sys_call:
         */
        andl    $~TS_COMPAT, ASM_THREAD_INFO(TI_status, %rsp, SIZEOF_PTREGS)
        movl    RIP(%rsp), %ecx         /* User %eip */
-       RESTORE_RSI_RDI
+       movl    RSI(%rsp), %esi
+       movl    RDI(%rsp), %edi
        xorl    %edx, %edx              /* Do not leak kernel information */
        xorq    %r8, %r8
        xorq    %r9, %r9
@@ -366,7 +367,9 @@ cstar_dispatch:
 
 sysretl_from_sys_call:
        andl    $~TS_COMPAT, ASM_THREAD_INFO(TI_status, %rsp, SIZEOF_PTREGS)
-       RESTORE_RSI_RDI_RDX
+       movl    RDX(%rsp), %edx
+       movl    RSI(%rsp), %esi
+       movl    RDI(%rsp), %edi
        movl    RIP(%rsp), %ecx
        movl    EFLAGS(%rsp), %r11d
        xorq    %r10, %r10