[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-b068621a53f92f42400581d69ad0e84c56620b0a@git.kernel.org>
Date: Sun, 4 Nov 2018 22:10:27 -0800
From: tip-bot for Randy Dunlap <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: peterz@...radead.org, torvalds@...ux-foundation.org,
mingo@...nel.org, hpa@...or.com, corbet@....net,
linux-kernel@...r.kernel.org, rdunlap@...radead.org,
tglx@...utronix.de
Subject: [tip:x86/urgent] Documentation/x86: Fix typo in zero-page.txt
Commit-ID: b068621a53f92f42400581d69ad0e84c56620b0a
Gitweb: https://git.kernel.org/tip/b068621a53f92f42400581d69ad0e84c56620b0a
Author: Randy Dunlap <rdunlap@...radead.org>
AuthorDate: Sun, 4 Nov 2018 14:03:56 -0800
Committer: Ingo Molnar <mingo@...nel.org>
CommitDate: Mon, 5 Nov 2018 07:05:45 +0100
Documentation/x86: Fix typo in zero-page.txt
Signed-off-by: Randy Dunlap <rdunlap@...radead.org>
Cc: Jonathan Corbet <corbet@....net>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: linux-doc@...r.kernel.org
Link: http://lkml.kernel.org/r/f259b21b-1f2b-f215-00d2-23388bed2530@infradead.org
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
Documentation/x86/zero-page.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/x86/zero-page.txt b/Documentation/x86/zero-page.txt
index 97b7adbceda4..68aed077f7b6 100644
--- a/Documentation/x86/zero-page.txt
+++ b/Documentation/x86/zero-page.txt
@@ -25,7 +25,7 @@ Offset Proto Name Meaning
0C8/004 ALL ext_cmd_line_ptr cmd_line_ptr high 32bits
140/080 ALL edid_info Video mode setup (struct edid_info)
1C0/020 ALL efi_info EFI 32 information (struct efi_info)
-1E0/004 ALL alk_mem_k Alternative mem check, in KB
+1E0/004 ALL alt_mem_k Alternative mem check, in KB
1E4/004 ALL scratch Scratch field for the kernel setup code
1E8/001 ALL e820_entries Number of entries in e820_table (below)
1E9/001 ALL eddbuf_entries Number of entries in eddbuf (below)
Powered by blists - more mailing lists