From nobody Fri Feb 13 08:19:23 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7463DE810A2 for ; Wed, 27 Sep 2023 08:14:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230365AbjI0IOG (ORCPT ); Wed, 27 Sep 2023 04:14:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51356 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230329AbjI0INo (ORCPT ); Wed, 27 Sep 2023 04:13:44 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CD6BC10D2; Wed, 27 Sep 2023 01:11:58 -0700 (PDT) Date: Wed, 27 Sep 2023 08:11:55 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1695802316; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=anBIMX9rLdyTWTzEQKQtKINs44DkgVwTkIyn5z1kY9U=; b=kp5WwD3zr+r2W4ZfnLFyXo03lwv8weqRuhLiQI8BKTdkms32k1nzOiIB0L5z6F/cmeRdXS XoxeBFxOcvywP2K7ck+xqHrrBX8vq2Oj2gU/OEaXAY2vNkmpNgz7LFuw7rjIV31SxGZI24 igd18Ql04FqElVTHHYpwMq9tvcqAgoqcEKyh4FBWose2c58kHFsoL+YXCdn7unCZa4AqX5 0FIbT0O0ALaA5x2rRKWOHdDBTSmE8sQhtMUmpmYo0P0pArvW0Hfojt8TK9SDDpF7yum8On iP1WFKn619h5lyq6RPP7AwDay7Nzg4Cb9RVa5v15CIHKO/CJIMY3zPQPe598wA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1695802316; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=anBIMX9rLdyTWTzEQKQtKINs44DkgVwTkIyn5z1kY9U=; b=o5Upo1nIJOmCtFIuOvhkdGMK7yjXjMDIpgJP/p9TCBiYfEmKfhxQiEhUhFgIX38IVlH4/e HdwUPerc27td4cDA== From: "tip-bot2 for Xin Li (Intel)" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/asm] x86/entry: Remove unused argument %rsi passed to exc_nmi() Cc: "Xin Li (Intel)" , Ingo Molnar , "H. Peter Anvin (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230926061319.1929127-1-xin@zytor.com> References: <20230926061319.1929127-1-xin@zytor.com> MIME-Version: 1.0 Message-ID: <169580231566.27769.3338218292814732836.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the x86/asm branch of tip: Commit-ID: da4aff622a7ae424a0292d7288744692fca34319 Gitweb: https://git.kernel.org/tip/da4aff622a7ae424a0292d7288744692f= ca34319 Author: Xin Li (Intel) AuthorDate: Mon, 25 Sep 2023 23:13:19 -07:00 Committer: Ingo Molnar 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) Signed-off-by: Ingo Molnar Acked-by: H. Peter Anvin (Intel) Link: https://lore.kernel.org/r/20230926061319.1929127-1-xin@zytor.com --- 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) */ =20 movq %rsp, %rdi - movq $-1, %rsi call exc_nmi =20 /* @@ -1451,7 +1450,6 @@ end_repeat_nmi: UNWIND_HINT_REGS =20 movq %rsp, %rdi - movq $-1, %rsi call exc_nmi =20 /* Always restore stashed SPEC_CTRL value (see paranoid_entry) */