summaryrefslogtreecommitdiff
path: root/Documentation/x86
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2015-06-30 08:57:04 +0300
committerIngo Molnar <mingo@kernel.org>2015-06-30 08:57:04 +0300
commitdc5fb575df9cdd34ac12bf7a814c9beae0a7ca9b (patch)
treecd2febb026bab11526f38b266a64f5086330d793 /Documentation/x86
parentdb52ef74b35dcb91fd154fa52c618bdd1b90e28e (diff)
parentf2af7d25b4aa5b01203cc76e7530ea7fd18864a0 (diff)
downloadlinux-dc5fb575df9cdd34ac12bf7a814c9beae0a7ca9b.tar.xz
Merge branch 'x86/boot' into x86/urgent
Merge branch that got ready. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Documentation/x86')
-rw-r--r--Documentation/x86/boot.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/x86/boot.txt b/Documentation/x86/boot.txt
index 7c1f9fad6674..9da6f3512249 100644
--- a/Documentation/x86/boot.txt
+++ b/Documentation/x86/boot.txt
@@ -406,7 +406,7 @@ Protocol: 2.00+
- If 0, the protected-mode code is loaded at 0x10000.
- If 1, the protected-mode code is loaded at 0x100000.
- Bit 1 (kernel internal): ALSR_FLAG
+ Bit 1 (kernel internal): KASLR_FLAG
- Used internally by the compressed kernel to communicate
KASLR status to kernel proper.
If 1, KASLR enabled.