public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Niklas Cassel <niklas.cassel@axis.com>
To: Thomas Gleixner <tglx@linutronix.de>,
	Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
	<x86@kernel.org>
Cc: Niklas Cassel <niklass@axis.com>, <linux-kernel@vger.kernel.org>
Subject: [PATCH] x86/kconfig: remove misleading note regarding hibernation and KASLR
Date: Mon, 6 Feb 2017 17:43:49 +0100	[thread overview]
Message-ID: <1486399429-23078-1-git-send-email-niklass@axis.com> (raw)

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

             reply	other threads:[~2017-02-06 16:44 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-02-06 16:43 Niklas Cassel [this message]
2017-02-07  9:43 ` [tip:x86/boot] x86/kconfig: Remove misleading note regarding hibernation and KASLR tip-bot for Niklas Cassel

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=1486399429-23078-1-git-send-email-niklass@axis.com \
    --to=niklas.cassel@axis.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@redhat.com \
    --cc=niklass@axis.com \
    --cc=tglx@linutronix.de \
    --cc=x86@kernel.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