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: 145591 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp2898966vqu; Wed, 27 Sep 2023 14:03:49 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEHUnZkCjiTLXiMzAReGGw5B4ApnC5AzF6Lbkj1kbomu6ak+RMBvOYISdnRufnRjQd/+5tO X-Received: by 2002:a17:90a:8508:b0:274:862f:3439 with SMTP id l8-20020a17090a850800b00274862f3439mr2749671pjn.13.1695848629410; Wed, 27 Sep 2023 14:03:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695848629; cv=none; d=google.com; s=arc-20160816; b=Q3evtgPYZifCNwe7QRQyTgbpuk2q/Cp6gmw44NYGoQFtMYYBqgAnrFiwsQARmeBw5+ 1RmpcQFT2jhPgn35Wf79hKPQdgneaJxcCpCekO7uWsCsMQCX9yimE0aAy1fw25BraqTo VgRyY3nET9l4pWIVw9uREOv1wIXY5Qtr6w8YHDK/o20x7ApyyMn7HsRLl72YngT0UeDz XgLBZxhHwX3o3TEUDh/obCBELB09OzKeHQXr64cYK1ZVnfDHdZS3CvssbJ3F68RDju+l nF+JJrH1e9FpxnlXukFOOCf75AgjBnavbZgSwbiNQiCrPpEoQJnat+96//Iz5nd/KkeM fAnw== 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=F2YEJv2i0yEIX+nDdMm0jTyutLcuZK+A6tHuXZ9sFuo=; fh=4CNWySJ5SggUjASzbV7+aIRmR8nH/qOXdWGlVnUACb8=; b=mLy4vA9Aqji1/U0KWRo/rP3azCrrbb4WrtSWNzIahmmr3vxFvLgoVgtEvKsDtONTJx 4H4H0YXOvDgA5G6SG76nNQWZiRXekibfoQHBWt5yZlFFspCypE5Dh/NhOswnaUwshuHK vvSsHsUNcnO1tCtxVpl9/wyyA/QCKTBlEPhmwkx0wl2jX5MsRQdq/UZXgeaHR8QsQkLj Z9cEoGrgyiWdELschUK6gznwSDkH3xRevPbD00482A+7lyxc90K9LaElDUQoHdWWJh9E VqSHxTLGp2+rYTpZG0tl9Xy+nodC7zQTNTMkpRSwuiRgee19Xm4llT/aVMxvmcbxUDS6 zcPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b="gYav+X/C"; dkim=neutral (no key) header.i=@linutronix.de header.b=QH8ZmU0a; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id mu14-20020a17090b388e00b0026d40e6a7d0si17998627pjb.56.2023.09.27.14.03.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Sep 2023 14:03:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b="gYav+X/C"; dkim=neutral (no key) header.i=@linutronix.de header.b=QH8ZmU0a; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (Postfix) with ESMTP id F2827823B3F0; Wed, 27 Sep 2023 01:15:04 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230274AbjI0IOf (ORCPT + 23 others); Wed, 27 Sep 2023 04:14:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51426 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230371AbjI0IOM (ORCPT ); Wed, 27 Sep 2023 04:14:12 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BBBDC2D59; Wed, 27 Sep 2023 01:11:59 -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=1695802315; 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=F2YEJv2i0yEIX+nDdMm0jTyutLcuZK+A6tHuXZ9sFuo=; b=gYav+X/CT9oUiDukPAMDaUeAnQ/1zx7xd6BuGh0n3Ccql1f+MFwP0NMo5jMcPtCz7pW7r/ CWiyYb9mJNtLyaxWpLvZry5ioWc0yA53uPS3j4QyZIlbPsuXMrKqzuyN73sSBcPMWZBBv7 dmhRf/Eh8oyMc/yi6dveyweiGklTwg6eDrMQ7qDQBJD/4GcixRf/1LinOl4XDdGQMXKd6R ZEAUsyILAPmchOOOwHetyrsCjqyJI0BjZyWUeVwiFAwShb8l5TjLTKcPAVIiMmSc2FwaeA 0tBCKBWtq7zS0HXi8inr0d+Qd9S+cUuBA4/7tBErjRZQZ5HJS66YAw/bThRziw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1695802315; 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=F2YEJv2i0yEIX+nDdMm0jTyutLcuZK+A6tHuXZ9sFuo=; b=QH8ZmU0adiZ6oDaGu6UpL2zA6Pkeq6usTO7PZ40XXhxKviBttOIkZI2bMMhh6VYQ0c5eQd n2a1qG+Ghcay42AQ== 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: Fix typos in comments 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: <169580231502.27769.3298035050053680158.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 pete.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 (pete.vger.email [0.0.0.0]); Wed, 27 Sep 2023 01:15:05 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778226172696525295 X-GMAIL-MSGID: 1778226172696525295 The following commit has been merged into the x86/asm branch of tip: Commit-ID: 1882366217757d3549e48a833bf9a5799b172251 Gitweb: https://git.kernel.org/tip/1882366217757d3549e48a833bf9a5799b172251 Author: Xin Li (Intel) AuthorDate: Mon, 25 Sep 2023 23:13:19 -07:00 Committer: Ingo Molnar CommitterDate: Wed, 27 Sep 2023 10:05:04 +02:00 x86/entry: Fix typos in comments Fix 2 typos in the comments. 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 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S index fb8dd56..b940e92 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -1163,8 +1163,8 @@ SYM_CODE_START(asm_exc_nmi) * anyway. * * To handle this case we do the following: - * Check the a special location on the stack that contains - * a variable that is set when NMIs are executing. + * Check a special location on the stack that contains a + * variable that is set when NMIs are executing. * The interrupted task's stack is also checked to see if it * is an NMI stack. * If the variable is not set and the stack is not the NMI @@ -1294,8 +1294,8 @@ SYM_CODE_START(asm_exc_nmi) * end_repeat_nmi, then we are a nested NMI. We must not * modify the "iret" frame because it's being written by * the outer NMI. That's okay; the outer NMI handler is - * about to about to call exc_nmi() anyway, so we can just - * resume the outer NMI. + * about to call exc_nmi() anyway, so we can just resume + * the outer NMI. */ movq $repeat_nmi, %rdx