Commit 5773ebfe authored Feb 06, 2017 by Niklas Cassel Committed by Ingo Molnar Feb 07, 2017

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:

  65fe935d ("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>

parent 9a1f4150

arch/x86/Kconfig

+0 −4

Original line number	Diff line number	Diff line
		@@ -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

Admin message