x86/kconfig: remove misleading note regarding hibernation and KASLR
PATCH 1/1 x86/kconfig: remove misleading note regarding hibernation and KASLR
From: Niklas Cassel <[email protected]>
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 <[email protected]>
--- arch/x86/Kconfig | 4 ---- 1 file changed, 4 deletions(-)
arch/x86/Kconfig +0 -4
@@ -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
Signature · 1 line
2.1.4
tip-bot for Niklas Cassel
merge bot[tip:x86/boot] x86/kconfig: Remove misleading note regarding hibernation and KASLR
x86/kconfig: Remove misleading note regarding hibernation and KASLR
Commit-ID: 5773ebfee729acf93b330664eab4c8d77edc2193 Gitweb: http://git.kernel.org/tip/5773ebfee729acf93b330664eab4c8d77edc2193 Author: Niklas Cassel <[email protected]> AuthorDate: Mon, 6 Feb 2017 17:43:49 +0100 Committer: Ingo Molnar <[email protected]> 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 <[email protected]>
Cc Kees Cook <[email protected]>
Cc Linus Torvalds <[email protected]>
Cc Niklas Cassel <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Thomas Gleixner <[email protected]>
Signed-off-by Ingo Molnar <[email protected]>
--- arch/x86/Kconfig | 4 ---- 1 file changed, 4 deletions(-)
arch/x86/Kconfig +0 -4
@@ -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