summaryrefslogtreecommitdiffstats
path: root/Documentation/x86/zero-page.txt
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2018-12-13 11:20:36 -0600
committerRob Herring <robh@kernel.org>2018-12-13 11:20:36 -0600
commitacc2038738bd6f881e7a277ba14fa7c589fd3058 (patch)
treefd56524867a9b726b3e5d2cb040ff16b2f2a67a0 /Documentation/x86/zero-page.txt
parentcd1cc0bef46fc8d8f9ebe82d2064d4f4bd5ecf16 (diff)
parent2c9b0b00af23cdc70d28d82e077dc1d280bcb84a (diff)
downloadlinux-acc2038738bd6f881e7a277ba14fa7c589fd3058.tar.bz2
Merge branch 'yaml-bindings-for-v4.21' into dt/next
Diffstat (limited to 'Documentation/x86/zero-page.txt')
-rw-r--r--Documentation/x86/zero-page.txt2
1 files changed, 1 insertions, 1 deletions
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)