diff options
author | Ben Hutchings <ben@decadent.org.uk> | 2011-01-02 23:02:42 +0000 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-01-03 05:25:52 +0100 |
commit | 551423748a4eba55f2eb0fc250d757986471f187 (patch) | |
tree | 401f03f7e5a70de089ef83153ac98096929c6f09 /Documentation | |
parent | b518a64983cbf2ff31aed530898de2d80e4573d5 (diff) | |
download | op-kernel-dev-551423748a4eba55f2eb0fc250d757986471f187.zip op-kernel-dev-551423748a4eba55f2eb0fc250d757986471f187.tar.gz |
watchdog: Improve initialisation error message and documentation
The error message 'NMI watchdog failed to create perf event...'
does not make it clear that this is a fatal error for the
watchdog. It also currently prints the error value as a
pointer, rather than extracting the error code with PTR_ERR().
Fix that.
Add a note to the description of the 'nowatchdog' kernel
parameter to associate it with this message.
Reported-by: Cesare Leonardi <celeonar@gmail.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Cc: 599368@bugs.debian.org
Cc: 608138@bugs.debian.org
Cc: Don Zickus <dzickus@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: <stable@kernel.org> # .37.x and later
LKML-Reference: <1294009362.3167.126.camel@localhost>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/kernel-parameters.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 8b61c93..01ece1b 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -1759,7 +1759,7 @@ and is between 256 and 4096 characters. It is defined in the file nousb [USB] Disable the USB subsystem - nowatchdog [KNL] Disable the lockup detector. + nowatchdog [KNL] Disable the lockup detector (NMI watchdog). nowb [ARM] |