aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2008-10-20 12:33:14 +0200
committerThomas Gleixner <tglx@linutronix.de>2008-10-20 12:44:32 +0200
commit322acf6585f3c4e82ee32a246b0483ca0f6ad3f4 (patch)
treeb57408bc3eeb523ece51ec524d31b90494809062
parent24bdeb4598b9560c8ffecb8ba5cefa01f3a12a54 (diff)
fix documentation of sysrq-q really
SysRq-Q also dumps information about the clockevent devices. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--Documentation/sysrq.txt4
-rw-r--r--drivers/char/sysrq.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/sysrq.txt b/Documentation/sysrq.txt
index 49378a9f2b5..7b3b069c376 100644
--- a/Documentation/sysrq.txt
+++ b/Documentation/sysrq.txt
@@ -95,8 +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 hrtimers.
- WARNING: Does not cover any other timers
+'q' - Will dump per CPU lists of all armed hrtimers (not timer_list timers)
+ and detailed information about all clockevent devices.
'r' - Turns off keyboard raw mode and sets it to XLATE.
diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c
index d0c0d64ed36..ce0d9da52a8 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 hrtimers (no others)",
+ .action_msg = "Show clockevent devices & pending hrtimers (no others)",
};
static void sysrq_handle_mountro(int key, struct tty_struct *tty)