From: Cyrill Gorcunov <gorcunov@gmail.com>
To: Ingo Molnar <mingo@elte.hu>, LKML <linux-kernel@vger.kernel.org>
Cc: "H. Peter Anvin" <hpa@zytor.com>,
"Maciej W. Rozycki" <macro@linux-mips.org>,
Thomas Gleixner <tglx@linutronix.de>,
Yinghai Lu <yhlu.kernel@gmail.com>,
Aristeu Rozanski <aris@redhat.com>
Subject: [PATCH] x86: nmi - nmi_watchdog boot param docs cleanup
Date: Sat, 1 Nov 2008 18:06:51 +0300 [thread overview]
Message-ID: <20081101150651.GA8106@localhost> (raw)
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 lapoc and ioapic keywords.
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
---
It's a bit fun but 'panic' was placed on a second
position which is just a plain wrong :-)
On top of -tip dda51106620c328b50007c259b9ef8cea2b7c3d2
Index: linux-2.6.git/Documentation/kernel-parameters.txt
===================================================================
--- linux-2.6.git.orig/Documentation/kernel-parameters.txt 2008-10-27 21:35:08.000000000 +0300
+++ linux-2.6.git/Documentation/kernel-parameters.txt 2008-11-01 17:53:08.000000000 +0300
@@ -1403,7 +1403,20 @@ and is between 256 and 4096 characters.
when a NMI is triggered.
Format: [state][,regs][,debounce][,die]
- nmi_watchdog= [KNL,BUGS=X86-32] Debugging features for SMP kernels
+ nmi_watchdog= [KNL,BUGS=X86-32,X86-64] Debugging features for SMP kernels
+ Format: [panic,][num]
+ Valid num: 0,1,2
+ 0 - turn nmi_watchdog off
+ 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.
+ Instead of 1 and 2 it is possible to use the following
+ symbolic names: lapic and ioapic
+ Example: nmi_watchdog=2 or nmi_watchdog=panic,lapic
no387 [BUGS=X86-32] Tells the kernel to use the 387 maths
emulation library even if a 387 maths coprocessor
Index: linux-2.6.git/Documentation/x86/x86_64/boot-options.txt
===================================================================
--- linux-2.6.git.orig/Documentation/x86/x86_64/boot-options.txt 2008-10-27 21:35:08.000000000 +0300
+++ linux-2.6.git/Documentation/x86/x86_64/boot-options.txt 2008-11-01 17:52:22.000000000 +0300
@@ -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.
next reply other threads:[~2008-11-01 15:07 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-01 15:06 Cyrill Gorcunov [this message]
2008-11-03 8:18 ` [PATCH] x86: nmi - nmi_watchdog boot param docs cleanup Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20081101150651.GA8106@localhost \
--to=gorcunov@gmail.com \
--cc=aris@redhat.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=macro@linux-mips.org \
--cc=mingo@elte.hu \
--cc=tglx@linutronix.de \
--cc=yhlu.kernel@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.