The following commit has been merged into the x86/entry branch of tip:

Commit-ID:     8518ad5d38056deee232b186533a18e7722ad3ad
Gitweb:        
https://git.kernel.org/tip/8518ad5d38056deee232b186533a18e7722ad3ad
Author:        Thomas Gleixner <[email protected]>
AuthorDate:    Thu, 21 May 2020 22:05:27 +02:00
Committer:     Ingo Molnar <[email protected]>
CommitterDate: Tue, 26 May 2020 19:06:28 +02:00

x86/entry/64: Simplify idtentry_body

All C functions which do not have an error code have been converted to the
new IDTENTRY interface which does not expect an error code in the
arguments. Spare the XORL.

Signed-off-by: Thomas Gleixner <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>
Acked-by: Andy Lutomirski <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
---
 arch/x86/entry/entry_64.S | 2 --
 1 file changed, 2 deletions(-)

diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S
index dadb37d..b70c778 100644
--- a/arch/x86/entry/entry_64.S
+++ b/arch/x86/entry/entry_64.S
@@ -531,8 +531,6 @@ SYM_CODE_END(spurious_entries_start)
        .if \has_error_code == 1
                movq    ORIG_RAX(%rsp), %rsi    /* get error code into 2nd 
argument*/
                movq    $-1, ORIG_RAX(%rsp)     /* no syscall to restart */
-       .else
-               xorl    %esi, %esi              /* Clear the error code */
        .endif
 
        .if \vector == X86_TRAP_PF

Reply via email to