The patch titled
Fix documentation of sysrq-q
has been removed from the -mm tree. Its filename was
fix-documentation-of-sysrq-q.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: Fix documentation of sysrq-q
From: Andi Kleen <andi@xxxxxxxxxxxxxx>
I fell into the trap recently that it only dumps hrtimers instead of
all timers. Fix the documentation.
Signed-off-by: Andi Kleen <ak@xxxxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
Documentation/sysrq.txt | 3 ++-
drivers/char/sysrq.c | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff -puN Documentation/sysrq.txt~fix-documentation-of-sysrq-q Documentation/sysrq.txt
--- a/Documentation/sysrq.txt~fix-documentation-of-sysrq-q
+++ a/Documentation/sysrq.txt
@@ -95,7 +95,8 @@ On all - write a character to /proc/sys
'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 -puN drivers/char/sysrq.c~fix-documentation-of-sysrq-q drivers/char/sysrq.c
--- a/drivers/char/sysrq.c~fix-documentation-of-sysrq-q
+++ a/drivers/char/sysrq.c
@@ -168,7 +168,7 @@ static void sysrq_handle_show_timers(int
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)
_
Patches currently in -mm which might be from andi@xxxxxxxxxxxxxx are
origin.patch
linux-next.patch
acpi-compal-laptop-use-rfkill-switch-subsystem.patch
sysfs-fix-return-values-for-sysdev_store_ulongint.patch
profile-likely-unlikely-macros.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
