1 files changed, 0 insertions, 11 deletions
diff --git a/Documentation/x86/x86_64/boot-options.txt b/Documentation/x86/x86_64/boot-options.txt
index 72ffb5373ec7..bc8a339c1f27 100644
--- a/Documentation/x86/x86_64/boot-options.txt
+++ b/Documentation/x86/x86_64/boot-options.txt
@@ -79,17 +79,6 @@ Timing
  Report when timer interrupts are lost because some code turned off
  interrupts for too long.
-  nmi_watchdog=NUMBER[,panic]
-  NUMBER can be:
-  0 don't use an NMI watchdog
-  1 use the IO-APIC timer for the NMI watchdog
-  2 use the local APIC for the NMI watchdog using a performance counter. Note
-  This will use one performance counter and the local APIC's performance
-  vector.
-  When panic is specified panic when an NMI watchdog timeout occurs.
-  This is useful when you use a panic=... timeout and need the box
-  quickly up again.
  nohpet
  Don't use the HPET timer.

diff --git a/Documentation/x86/x86_64/boot-options.txt b/Documentation/x86/x86_64/boot-options.txt index 72ffb5373ec7..bc8a339c1f27 100644 --- a/Documentation/x86/x86_64/boot-options.txt +++ b/Documentation/x86/x86_64/boot-options.txt
@@ -79,17 +79,6 @@ Timing
79	Report when timer interrupts are lost because some code turned off	79	Report when timer interrupts are lost because some code turned off
80	interrupts for too long.	80	interrupts for too long.
81		81
82	nmi_watchdog=NUMBER[,panic]
83	NUMBER can be:
84	0 don't use an NMI watchdog
85	1 use the IO-APIC timer for the NMI watchdog
86	2 use the local APIC for the NMI watchdog using a performance counter. Note
87	This will use one performance counter and the local APIC's performance
88	vector.
89	When panic is specified panic when an NMI watchdog timeout occurs.
90	This is useful when you use a panic=... timeout and need the box
91	quickly up again.
92
93	nohpet	82	nohpet
94	Don't use the HPET timer.	83	Don't use the HPET timer.
95		84