From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753983AbbEKMq2 (ORCPT ); Mon, 11 May 2015 08:46:28 -0400 Received: from terminus.zytor.com ([198.137.202.10]:60728 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753955AbbEKMqV (ORCPT ); Mon, 11 May 2015 08:46:21 -0400 Date: Mon, 11 May 2015 05:45:22 -0700 From: tip-bot for Miroslav Benes Message-ID: Cc: luto@amacapital.net, dvlasenk@redhat.com, brgerst@gmail.com, jkosina@suse.cz, hpa@zytor.com, mbenes@suse.cz, corbet@lwn.net, tglx@linutronix.de, mingo@kernel.org, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, bp@suse.de, bp@alien8.de, peterz@infradead.org Reply-To: bp@alien8.de, peterz@infradead.org, bp@suse.de, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, tglx@linutronix.de, mingo@kernel.org, corbet@lwn.net, jkosina@suse.cz, hpa@zytor.com, mbenes@suse.cz, dvlasenk@redhat.com, brgerst@gmail.com, luto@amacapital.net In-Reply-To: <1431332153-18566-4-git-send-email-bp@alien8.de> References: <1429011324-7170-1-git-send-email-mbenes@suse.cz> <1431332153-18566-4-git-send-email-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/boot] x86/kaslr: Fix typo in the KASLR_FLAG documentation Git-Commit-ID: d4bd441532b81fe2be1706e7f9dbbe8b5a364bcf X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: d4bd441532b81fe2be1706e7f9dbbe8b5a364bcf Gitweb: http://git.kernel.org/tip/d4bd441532b81fe2be1706e7f9dbbe8b5a364bcf Author: Miroslav Benes AuthorDate: Mon, 11 May 2015 10:15:48 +0200 Committer: Ingo Molnar 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 Signed-off-by: Borislav Petkov Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Jiri Kosina Cc: Jonathan Corbet Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner 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 --- 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.