[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-d4bd441532b81fe2be1706e7f9dbbe8b5a364bcf@git.kernel.org>
Date: Mon, 11 May 2015 05:45:22 -0700
From: tip-bot for Miroslav Benes <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: luto@...capital.net, dvlasenk@...hat.com, brgerst@...il.com,
jkosina@...e.cz, hpa@...or.com, mbenes@...e.cz, corbet@....net,
tglx@...utronix.de, mingo@...nel.org, linux-kernel@...r.kernel.org,
torvalds@...ux-foundation.org, bp@...e.de, bp@...en8.de,
peterz@...radead.org
Subject: [tip:x86/boot] x86/kaslr:
Fix typo in the KASLR_FLAG documentation
Commit-ID: d4bd441532b81fe2be1706e7f9dbbe8b5a364bcf
Gitweb: http://git.kernel.org/tip/d4bd441532b81fe2be1706e7f9dbbe8b5a364bcf
Author: Miroslav Benes <mbenes@...e.cz>
AuthorDate: Mon, 11 May 2015 10:15:48 +0200
Committer: Ingo Molnar <mingo@...nel.org>
CommitDate: Mon, 11 May 2015 10:28:57 +0200
x86/kaslr: Fix typo in the KASLR_FLAG documentation
Documentation/x86/boot.txt labels the bit in
boot_params.hdr.loadflags as ALSR_FLAG while it should be
KASLR_FLAG.
Signed-off-by: Miroslav Benes <mbenes@...e.cz>
Signed-off-by: Borislav Petkov <bp@...e.de>
Cc: Andy Lutomirski <luto@...capital.net>
Cc: Borislav Petkov <bp@...en8.de>
Cc: Brian Gerst <brgerst@...il.com>
Cc: Denys Vlasenko <dvlasenk@...hat.com>
Cc: H. Peter Anvin <hpa@...or.com>
Cc: Jiri Kosina <jkosina@...e.cz>
Cc: Jonathan Corbet <corbet@....net>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Thomas Gleixner <tglx@...utronix.de>
Link: http://lkml.kernel.org/r/1429011324-7170-1-git-send-email-mbenes@suse.cz
Link: http://lkml.kernel.org/r/1431332153-18566-4-git-send-email-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
Documentation/x86/boot.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/x86/boot.txt b/Documentation/x86/boot.txt
index 88b8589..69e1397 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.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists