Commit-ID:  9e7a0bc0a315f3c2a6902e04b60a86edd78c1164
Gitweb:     https://git.kernel.org/tip/9e7a0bc0a315f3c2a6902e04b60a86edd78c1164
Author:     zhenwei.pi <[email protected]>
AuthorDate: Mon, 25 Dec 2017 10:56:31 +0800
Committer:  Ingo Molnar <[email protected]>
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 <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Link: 
http://lkml.kernel.org/r/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>
---
 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 <http://www.bitwizard.nl/sig11/>
-         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 <http://www.bitwizard.nl/sig11/>
+         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.

Reply via email to