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

From: Niklas Cassel
Date: Mon Feb 06 2017 - 11:44:55 EST


From: Niklas Cassel <niklas.cassel@xxxxxxxx>

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@xxxxxxxx>
---
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