[PATCH] x86/kconfig: remove misleading note regarding hibernation and KASLR

[PATCH] x86/kconfig: remove misleading note regarding hibernation and KASLR

[Niklas Cassel]

From: Niklas Cassel <niklas.cassel@axis.com>

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.cassel@axis.com>
---
 arch/x86/Kconfig | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index e0285774bdda..04e5bf5c4666 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1997,10 +1997,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
-- 
2.1.4

[tip:x86/boot] x86/kconfig: Remove misleading note regarding hibernation and KASLR

[tip-bot for Niklas Cassel]

Commit-ID:  5773ebfee729acf93b330664eab4c8d77edc2193
Gitweb:     http://git.kernel.org/tip/5773ebfee729acf93b330664eab4c8d77edc2193
Author:     Niklas Cassel <niklas.cassel@axis.com>
AuthorDate: Mon, 6 Feb 2017 17:43:49 +0100
Committer:  Ingo Molnar <mingo@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.cassel@axis.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Niklas Cassel <niklass@axis.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1486399429-23078-1-git-send-email-niklass@axis.com
Signed-off-by: Ingo Molnar <mingo@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