From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756245AbeAHUjL (ORCPT + 1 other); Mon, 8 Jan 2018 15:39:11 -0500 Received: from terminus.zytor.com ([65.50.211.136]:55991 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751773AbeAHUjJ (ORCPT ); Mon, 8 Jan 2018 15:39:09 -0500 Date: Mon, 8 Jan 2018 12:35:43 -0800 From: "tip-bot for zhenwei.pi" Message-ID: Cc: tglx@linutronix.de, peterz@infradead.org, zhenwei.pi@youruncloud.com, hpa@zytor.com, torvalds@linux-foundation.org, mingo@kernel.org, linux-kernel@vger.kernel.org Reply-To: linux-kernel@vger.kernel.org, mingo@kernel.org, torvalds@linux-foundation.org, hpa@zytor.com, zhenwei.pi@youruncloud.com, peterz@infradead.org, tglx@linutronix.de In-Reply-To: <1514170591-25120-1-git-send-email-zhenwei.pi@youruncloud.com> References: <1514170591-25120-1-git-send-email-zhenwei.pi@youruncloud.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/boot] x86/kconfig: Remove residual "no-hlt" boot parameter reference Git-Commit-ID: 9e7a0bc0a315f3c2a6902e04b60a86edd78c1164 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 Return-Path: Commit-ID: 9e7a0bc0a315f3c2a6902e04b60a86edd78c1164 Gitweb: https://git.kernel.org/tip/9e7a0bc0a315f3c2a6902e04b60a86edd78c1164 Author: zhenwei.pi AuthorDate: Mon, 25 Dec 2017 10:56:31 +0800 Committer: Ingo Molnar CommitDate: Mon, 8 Jan 2018 20:09:25 +0100 x86/kconfig: Remove residual "no-hlt" boot parameter reference The "no-hlt" boot parameter has been removed ~5 years ago: 27be45700021 ("x86 idle: remove 32-bit-only "no-hlt" parameter, hlt_works_ok flag") Remove a stale reference from the documentation as well. Signed-off-by: zhenwei.pi Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/1514170591-25120-1-git-send-email-zhenwei.pi@youruncloud.com Signed-off-by: Ingo Molnar --- arch/x86/Kconfig | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 8eed3f9..cf49280 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -2425,19 +2425,18 @@ menuconfig APM 1) make sure that you have enough swap space and that it is enabled. - 2) pass the "no-hlt" option to the kernel - 3) switch on floating point emulation in the kernel and pass + 2) switch on floating point emulation in the kernel and pass the "no387" option to the kernel - 4) pass the "floppy=nodma" option to the kernel - 5) pass the "mem=4M" option to the kernel (thereby disabling + 3) pass the "floppy=nodma" option to the kernel + 4) pass the "mem=4M" option to the kernel (thereby disabling all but the first 4 MB of RAM) - 6) make sure that the CPU is not over clocked. - 7) read the sig11 FAQ at - 8) disable the cache from your BIOS settings - 9) install a fan for the video card or exchange video RAM - 10) install a better fan for the CPU - 11) exchange RAM chips - 12) exchange the motherboard. + 5) make sure that the CPU is not over clocked. + 6) read the sig11 FAQ at + 7) disable the cache from your BIOS settings + 8) install a fan for the video card or exchange video RAM + 9) install a better fan for the CPU + 10) exchange RAM chips + 11) exchange the motherboard. To compile this driver as a module, choose M here: the module will be called apm.