From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753497AbdBGJp0 (ORCPT ); Tue, 7 Feb 2017 04:45:26 -0500 Received: from terminus.zytor.com ([65.50.211.136]:33498 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753079AbdBGJpV (ORCPT ); Tue, 7 Feb 2017 04:45:21 -0500 Date: Tue, 7 Feb 2017 01:43:58 -0800 From: tip-bot for Niklas Cassel Message-ID: 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 Reply-To: niklass@axis.com, hpa@zytor.com, mingo@kernel.org, tglx@linutronix.de, niklas.cassel@axis.com, keescook@chromium.org, torvalds@linux-foundation.org, peterz@infradead.org, linux-kernel@vger.kernel.org In-Reply-To: <1486399429-23078-1-git-send-email-niklass@axis.com> References: <1486399429-23078-1-git-send-email-niklass@axis.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/boot] x86/kconfig: Remove misleading note regarding hibernation and KASLR Git-Commit-ID: 5773ebfee729acf93b330664eab4c8d77edc2193 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 5773ebfee729acf93b330664eab4c8d77edc2193 Gitweb: http://git.kernel.org/tip/5773ebfee729acf93b330664eab4c8d77edc2193 Author: Niklas Cassel AuthorDate: Mon, 6 Feb 2017 17:43:49 +0100 Committer: Ingo Molnar 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 Cc: Kees Cook Cc: Linus Torvalds Cc: Niklas Cassel Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/1486399429-23078-1-git-send-email-niklass@axis.com Signed-off-by: Ingo Molnar --- 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