Commit-ID: 5773ebfee729acf93b330664eab4c8d77edc2193
Gitweb: http://git.kernel.org/tip/5773ebfee729acf93b330664eab4c8d77edc2193
Author: Niklas Cassel <niklas.cas...@axis.com>
AuthorDate: Mon, 6 Feb 2017 17:43:49 +0100
Committer: Ingo Molnar <mi...@kernel.org>
CommitDate: Tue, 7 Feb 2017 10:39:58 +0100
x86/kconfig: Remove misleading note regarding hibernation and KASLR
There used to be a restriction with KASLR and hibernation, but this is no
longer true, and since commit:
65fe935dd238 ("x86/KASLR, x86/power: Remove x86 hibernation restrictions")
the parameter "kaslr" does no longer exist.
Signed-off-by: Niklas Cassel <niklas.cas...@axis.com>
Cc: Kees Cook <keesc...@chromium.org>
Cc: Linus Torvalds <torva...@linux-foundation.org>
Cc: Niklas Cassel <nikl...@axis.com>
Cc: Peter Zijlstra <pet...@infradead.org>
Cc: Thomas Gleixner <t...@linutronix.de>
Link:
http://lkml.kernel.org/r/1486399429-23078-1-git-send-email-nikl...@axis.com
Signed-off-by: Ingo Molnar <mi...@kernel.org>
---
arch/x86/Kconfig | 4 ----
1 file changed, 4 deletions(-)
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index e487493..4e6dbca 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1994,10 +1994,6 @@ config RANDOMIZE_BASE
theoretically possible, but the implementations are further
limited due to memory layouts.
- If CONFIG_HIBERNATE is also enabled, KASLR is disabled at boot
- time. To enable it, boot with "kaslr" on the kernel command
- line (which will also disable hibernation).
-
If unsure, say N.
# Relocation on x86 needs some additional build support
