diff options
| author | Andi Kleen <andi@firstfloor.org> | 2008-10-18 20:27:27 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-20 08:52:34 -0700 |
| commit | 2a80a3783d975dadea9740b0ac84c2e8796ee5bb (patch) | |
| tree | 2b312064dd7a5d5e66afd8d5c342ddc2d2d30136 | |
| parent | 966c8079c0eae66242692184982dc70671dbe90f (diff) | |
| download | linux-stable-2a80a3783d975dadea9740b0ac84c2e8796ee5bb.tar.gz linux-stable-2a80a3783d975dadea9740b0ac84c2e8796ee5bb.tar.bz2 linux-stable-2a80a3783d975dadea9740b0ac84c2e8796ee5bb.zip | |
Fix documentation of sysrq-q
I fell into the trap recently that it only dumps hrtimers instead of
all timers. Fix the documentation.
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | Documentation/sysrq.txt | 3 | ||||
| -rw-r--r-- | drivers/char/sysrq.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/sysrq.txt b/Documentation/sysrq.txt index 5ce0952aa065..49378a9f2b5f 100644 --- a/Documentation/sysrq.txt +++ b/Documentation/sysrq.txt @@ -95,7 +95,8 @@ On all - write a character to /proc/sysrq-trigger. e.g.: 'p' - Will dump the current registers and flags to your console. -'q' - Will dump a list of all running timers. +'q' - Will dump a list of all running hrtimers. + WARNING: Does not cover any other timers 'r' - Turns off keyboard raw mode and sets it to XLATE. diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c index dce4cc0e6953..d0c0d64ed366 100644 --- a/drivers/char/sysrq.c +++ b/drivers/char/sysrq.c @@ -168,7 +168,7 @@ static void sysrq_handle_show_timers(int key, struct tty_struct *tty) static struct sysrq_key_op sysrq_show_timers_op = { .handler = sysrq_handle_show_timers, .help_msg = "show-all-timers(Q)", - .action_msg = "Show Pending Timers", + .action_msg = "Show pending hrtimers (no others)", }; static void sysrq_handle_mountro(int key, struct tty_struct *tty) |