From: "tip-bot2 for Xin Li (Intel)" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: "Xin Li (Intel)" <xin@zytor.com>, Ingo Molnar <mingo@kernel.org>,
"H. Peter Anvin (Intel)" <hpa@zytor.com>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/asm] x86/entry: Fix typos in comments
Date: Wed, 27 Sep 2023 08:11:55 -0000 [thread overview]
Message-ID: <169580231502.27769.3298035050053680158.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20230926061319.1929127-1-xin@zytor.com>
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) <xin@zytor.com>
AuthorDate: Mon, 25 Sep 2023 23:13:19 -07:00
Committer: Ingo Molnar <mingo@kernel.org>
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) <xin@zytor.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Acked-by: H. Peter Anvin (Intel) <hpa@zytor.com>
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
prev parent reply other threads:[~2023-09-27 8:14 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-26 6:13 [PATCH 1/1] x86/entry: remove unused argument %rsi passed to exc_nmi() xin
2023-09-27 8:06 ` Ingo Molnar
2023-09-27 8:12 ` Xin Li
2023-09-27 19:15 ` H. Peter Anvin
2023-09-27 8:11 ` [tip: x86/asm] x86/entry: Remove " tip-bot2 for Xin Li (Intel)
2023-09-27 8:11 ` tip-bot2 for Xin Li (Intel) [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=169580231502.27769.3298035050053680158.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=x86@kernel.org \
--cc=xin@zytor.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®