Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 2a80a3783d975dadea9740b0ac84c2e8796ee5bb

Authored by Andi Kleen
Committed by Linus Torvalds
1 parent 966c8079c0
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

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>

Showing 2 changed files with 3 additions and 2 deletions Side-by-side Diff

Documentation/sysrq.txt
Diff comments   View file @ 2a80a37
... ... @@ -95,7 +95,8 @@
95 95  
96 96 'p' - Will dump the current registers and flags to your console.
97 97  
98   -'q' - Will dump a list of all running timers.
  98 +'q' - Will dump a list of all running hrtimers.
  99 + WARNING: Does not cover any other timers
99 100  
100 101 'r' - Turns off keyboard raw mode and sets it to XLATE.
101 102  
drivers/char/sysrq.c
Diff comments   View file @ 2a80a37
... ... @@ -168,7 +168,7 @@
168 168 static struct sysrq_key_op sysrq_show_timers_op = {
169 169 .handler = sysrq_handle_show_timers,
170 170 .help_msg = "show-all-timers(Q)",
171   - .action_msg = "Show Pending Timers",
  171 + .action_msg = "Show pending hrtimers (no others)",
172 172 };
173 173  
174 174 static void sysrq_handle_mountro(int key, struct tty_struct *tty)