From: "tip-bot2 for Cao jin" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Cao jin <caoj.fnst@cn.fujitsu.com>, Borislav Petkov <bp@suse.de>,
"H. Peter Anvin" <hpa@zytor.com>, Baoquan He <bhe@redhat.com>,
Dave Young <dyoung@redhat.com>,
David Howells <dhowells@redhat.com>,
Ingo Molnar <mingo@redhat.com>, Juergen Gross <jgross@suse.com>,
Robert Richter <rrichter@marvell.com>,
Thomas Gleixner <tglx@linutronix.de>,
Thomas Lendacky <Thomas.Lendacky@amd.com>,
"x86-ml" <x86@kernel.org>, Ingo Molnar <mingo@kernel.org>,
Borislav Petkov <bp@alien8.de>,
linux-kernel@vger.kernel.org
Subject: [tip: x86/cleanups] x86: Fix typos in comments
Date: Mon, 18 Nov 2019 09:11:21 -0000 [thread overview]
Message-ID: <157406828172.12247.4218858363680758865.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20191118070012.27850-1-caoj.fnst@cn.fujitsu.com>
The following commit has been merged into the x86/cleanups branch of tip:
Commit-ID: 11a98f37a5c11fd3cec9c7a566dfa902bceb5bde
Gitweb: https://git.kernel.org/tip/11a98f37a5c11fd3cec9c7a566dfa902bceb5bde
Author: Cao jin <caoj.fnst@cn.fujitsu.com>
AuthorDate: Mon, 18 Nov 2019 15:00:12 +08:00
Committer: Borislav Petkov <bp@suse.de>
CommitterDate: Mon, 18 Nov 2019 10:03:26 +01:00
x86: Fix typos in comments
BIOSen -> BIOSes; paing -> paging. Append to 640 its proper unit "Kb".
encomapssing -> encompassing.
[ bp: Merge into a single patch, fix one more typo, massage. ]
Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Baoquan He <bhe@redhat.com>
Cc: Dave Young <dyoung@redhat.com>
Cc: David Howells <dhowells@redhat.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: Robert Richter <rrichter@marvell.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Thomas Lendacky <Thomas.Lendacky@amd.com>
Cc: x86-ml <x86@kernel.org>
Link: https://lkml.kernel.org/r/20191118070012.27850-1-caoj.fnst@cn.fujitsu.com
---
arch/x86/kernel/setup.c | 6 +++---
arch/x86/mm/numa.c | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 77ea96b..35b3f3a 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -459,7 +459,7 @@ static void __init memblock_x86_reserve_range_setup_data(void)
* due to mapping restrictions.
*
* On 64bit, kdump kernel need be restricted to be under 64TB, which is
- * the upper limit of system RAM in 4-level paing mode. Since the kdump
+ * the upper limit of system RAM in 4-level paging mode. Since the kdump
* jumping could be from 5-level to 4-level, the jumping will fail if
* kernel is put above 64TB, and there's no way to detect the paging mode
* of the kernel which will be loaded for dumping during the 1st kernel
@@ -743,8 +743,8 @@ static void __init trim_bios_range(void)
e820__range_update(0, PAGE_SIZE, E820_TYPE_RAM, E820_TYPE_RESERVED);
/*
- * special case: Some BIOSen report the PC BIOS
- * area (640->1Mb) as ram even though it is not.
+ * special case: Some BIOSes report the PC BIOS
+ * area (640Kb -> 1Mb) as RAM even though it is not.
* take them out.
*/
e820__range_remove(BIOS_BEGIN, BIOS_END - BIOS_BEGIN, E820_TYPE_RAM, 1);
diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
index 4123100..99f7a68 100644
--- a/arch/x86/mm/numa.c
+++ b/arch/x86/mm/numa.c
@@ -699,7 +699,7 @@ static int __init dummy_numa_init(void)
* x86_numa_init - Initialize NUMA
*
* Try each configured NUMA initialization method until one succeeds. The
- * last fallback is dummy single node config encomapssing whole memory and
+ * last fallback is dummy single node config encompassing whole memory and
* never fails.
*/
void __init x86_numa_init(void)
next prev parent reply other threads:[~2019-11-18 9:11 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-18 7:00 [RESEND PATCH] x86/setup: Fix typos Cao jin
2019-11-18 9:11 ` tip-bot2 for Cao jin [this message]
2019-11-18 12:10 ` [tip: x86/cleanups] x86: Fix typos in comments Ingo Molnar
2019-11-18 12:46 ` Borislav Petkov
2019-11-18 17:43 ` [PATCH] " Ingo Molnar
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=157406828172.12247.4218858363680758865.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=Thomas.Lendacky@amd.com \
--cc=bhe@redhat.com \
--cc=bp@alien8.de \
--cc=bp@suse.de \
--cc=caoj.fnst@cn.fujitsu.com \
--cc=dhowells@redhat.com \
--cc=dyoung@redhat.com \
--cc=hpa@zytor.com \
--cc=jgross@suse.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=mingo@redhat.com \
--cc=rrichter@marvell.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).