From patchwork Wed Sep 27 08:11:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 145278 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp2501901vqu; Wed, 27 Sep 2023 02:33:15 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFoWPNn9SGizq4Jxk9GAqEO4UeM0GHd6c+A/z399XCxPo6vdm3chRTi+VE7w97MeBRNxf00 X-Received: by 2002:a54:4082:0:b0:3a3:9df9:1918 with SMTP id i2-20020a544082000000b003a39df91918mr1358144oii.20.1695807195395; Wed, 27 Sep 2023 02:33:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695807195; cv=none; d=google.com; s=arc-20160816; b=vQm5s8uPTLU3+5AfRRxS3cFdOq0dTyb0wIYJGPSY5dPBFAhQ2gvHGK/+p3VzVY3LaY dLD0DfQil11TahD95J6MkY1EsIlKw5r/B6gmwtUbbH9UuW804sj5LZpnajVFer+WedSL IoM13y3IYBNSNEuVLLEc6fEYIEumcQVbvNvZB0YcAUydGIKCaKqMB94bA0pAn5c4FmWu bHez2PuYlhG2UdeNVn1eQBGndjbTGnv6IKgfPwiDLaRh553WBzs0cLnKPRX9drAhI15U qjjYMc21tvAoomNGcM4dgUkOHhOtYhqWLrWZXAlfq7S1RjaUonFydcUws6rKpWia2/wp G0Jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=anBIMX9rLdyTWTzEQKQtKINs44DkgVwTkIyn5z1kY9U=; fh=4CNWySJ5SggUjASzbV7+aIRmR8nH/qOXdWGlVnUACb8=; b=G4huE3yI7nSXCIN/EAS/ViXdblgNRfgzbumX8as1xqbx12jK0C9yVeMs6yjoXNLlIm BZA8eH0OHke/u2FGvjwsi+SxeLmvYamROoxtqo4gqCc8vEOA/NjTo869Zn/MaFtBnMpH cXd6LMRKzmgb0elNtLUmLonomZtY1oB7IuoPDdYczVeRosG/aB6OqxVboshuUQCKMK60 mjxXzE5Oz66G/Xic8thue9jjX4K/lZq3STN+8IFCY+QfHIDmcfq9ePsFDWElMBtgBbVT 5ow/fX4qeLUoLk036S1oOa9orbwBRtgQWcvKJ8uyvgFi4Ihgss4pCJO3EydVVtQCFWiz uK0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=kp5WwD3z; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id k83-20020a628456000000b0068e3f55075esi14977405pfd.134.2023.09.27.02.33.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Sep 2023 02:33:15 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=kp5WwD3z; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 09C8580E6CB0; Wed, 27 Sep 2023 01:14:36 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230351AbjI0IOF (ORCPT + 23 others); Wed, 27 Sep 2023 04:14:05 -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 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Wed, 27 Sep 2023 01:14:36 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778182725607568976 X-GMAIL-MSGID: 1778182725607568976 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) 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) */ 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) */