diff options
author | Cyrill Gorcunov <gorcunov@gmail.com> | 2008-11-01 11:06:51 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-11-03 03:17:39 -0500 |
commit | 5b9a0e14eb4bf40a7cb780af4723560e06753f2d (patch) | |
tree | 9f5720657a6ff48bac77b64448f4b6b85b63ce7e /Documentation/x86/x86_64 | |
parent | 8a1c8eb75be492e20003966652c9cd5ff57a559d (diff) |
x86: nmi - nmi_watchdog boot param docs cleanup
Impact: documentation update
1) nmi_watchdog boot parameter is common to 32/64 bit modes. So
move it from Documentation/x86/x86_64/boot-options.txt to
Documentation/kernel-parameters.txt and integrate with.
2) Also fix [panic] keyword placement -- it ought to be at first
position otherwise it will not be recognized.
3) Document lapic and ioapic keywords.
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'Documentation/x86/x86_64')
-rw-r--r-- | Documentation/x86/x86_64/boot-options.txt | 11 |
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 | |||
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 | ||