From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752441AbdBFQow (ORCPT ); Mon, 6 Feb 2017 11:44:52 -0500 Received: from bes.se.axis.com ([195.60.68.10]:41955 "EHLO bes.se.axis.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752355AbdBFQov (ORCPT ); Mon, 6 Feb 2017 11:44:51 -0500 From: Niklas Cassel To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , CC: Niklas Cassel , Subject: [PATCH] x86/kconfig: remove misleading note regarding hibernation and KASLR Date: Mon, 6 Feb 2017 17:43:49 +0100 Message-ID: <1486399429-23078-1-git-send-email-niklass@axis.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.0.5.60] X-ClientProxiedBy: XBOX02.axis.com (10.0.5.16) To XBOX02.axis.com (10.0.5.16) X-TM-AS-GCONF: 00 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Niklas Cassel 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 --- 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