diff options
| author | Cyrill Gorcunov <gorcunov@gmail.com> | 2008-11-01 16:06:51 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-03 09:17:39 +0100 |
| commit | 5b9a0e14eb4bf40a7cb780af4723560e06753f2d (patch) | |
| tree | 9f5720657a6ff48bac77b64448f4b6b85b63ce7e /Documentation/x86 | |
| parent | x86, nmi-watchdog: update procfs nmi_watchdog file documentation v2 (diff) | |
| download | linux-5b9a0e14eb4bf40a7cb780af4723560e06753f2d.tar.xz linux-5b9a0e14eb4bf40a7cb780af4723560e06753f2d.zip | |
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')
| -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 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. |