* [PATCH] x86/kconfig: remove misleading note regarding hibernation and KASLR
@ 2017-02-06 16:43 Niklas Cassel
2017-02-07 9:43 ` [tip:x86/boot] x86/kconfig: Remove " tip-bot for Niklas Cassel
0 siblings, 1 reply; 2+ messages in thread
From: Niklas Cassel @ 2017-02-06 16:43 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, x86
Cc: Niklas Cassel, linux-kernel
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [tip:x86/boot] x86/kconfig: Remove misleading note regarding hibernation and KASLR
2017-02-06 16:43 [PATCH] x86/kconfig: remove misleading note regarding hibernation and KASLR Niklas Cassel
@ 2017-02-07 9:43 ` tip-bot for Niklas Cassel
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot for Niklas Cassel @ 2017-02-07 9:43 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, peterz, keescook, torvalds, niklas.cassel, tglx,
niklass, hpa, mingo
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-02-07 9:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-02-06 16:43 [PATCH] x86/kconfig: remove misleading note regarding hibernation and KASLR Niklas Cassel
2017-02-07 9:43 ` [tip:x86/boot] x86/kconfig: Remove " tip-bot for Niklas Cassel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).