From: tip-bot for Niklas Cassel <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, peterz@infradead.org,
keescook@chromium.org, torvalds@linux-foundation.org,
niklas.cassel@axis.com, tglx@linutronix.de, niklass@axis.com,
hpa@zytor.com, mingo@kernel.org
Subject: [tip:x86/boot] x86/kconfig: Remove misleading note regarding hibernation and KASLR
Date: Tue, 7 Feb 2017 01:43:58 -0800 [thread overview]
Message-ID: <tip-5773ebfee729acf93b330664eab4c8d77edc2193@git.kernel.org> (raw)
In-Reply-To: <1486399429-23078-1-git-send-email-niklass@axis.com>
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
prev parent reply other threads:[~2017-02-07 9:45 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-5773ebfee729acf93b330664eab4c8d77edc2193@git.kernel.org \
--to=tipbot@zytor.com \
--cc=hpa@zytor.com \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=niklas.cassel@axis.com \
--cc=niklass@axis.com \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox