The following commit has been merged into the x86/asm branch of tip: Commit-ID: da4aff622a7ae424a0292d7288744692fca34319 Gitweb: https://git.kernel.org/tip/da4aff622a7ae424a0292d7288744692fca34319 Author: Xin Li (Intel) <xin@xxxxxxxxx> AuthorDate: Mon, 25 Sep 2023 23:13:19 -07:00 Committer: Ingo Molnar <mingo@xxxxxxxxxx> CommitterDate: Wed, 27 Sep 2023 10:04:54 +02:00 x86/entry: Remove unused argument %rsi passed to exc_nmi() exc_nmi() only takes one argument of type struct pt_regs *, but asm_exc_nmi() calls it with 2 arguments. The second one passed in %rsi seems to be a leftover, so simply remove it. Signed-off-by: Xin Li (Intel) <xin@xxxxxxxxx> Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> Acked-by: H. Peter Anvin (Intel) <hpa@xxxxxxxxx> Link: https://lore.kernel.org/r/20230926061319.1929127-1-xin@xxxxxxxxx --- 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 43606de..fb8dd56 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -1237,7 +1237,6 @@ SYM_CODE_START(asm_exc_nmi) */ movq %rsp, %rdi - movq $-1, %rsi call exc_nmi /* @@ -1451,7 +1450,6 @@ end_repeat_nmi: UNWIND_HINT_REGS movq %rsp, %rdi - movq $-1, %rsi call exc_nmi /* Always restore stashed SPEC_CTRL value (see paranoid_entry) */
|