summaryrefslogtreecommitdiff
path: root/Documentation/sysrq.txt
diff options
context:
space:
mode:
authorRandy Dunlap <randy.dunlap@oracle.com>2010-10-26 14:20:40 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-26 17:32:41 -0700
commit003bb8ab7cecbfd1830bbccf9c6a9e2047d27c5c (patch)
tree1a98a458025f725dde1f9a16c2863e28d8356453 /Documentation/sysrq.txt
parentd2d8f66bb991757e360728da77920e18bd678767 (diff)
documentation: update sysrq.txt magic sysrq keys
Update Documentation/sysrq.txt magic sysrq keys: - 'g' is for kgdb (not arch-specific); - add 2 new uses for 'v', remove the Voyager info; - add 'y' info (SPARC-64 specific); Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Cc: Jason Wessel <jason.wessel@windriver.com> Cc: "David S. Miller" <davem@davemloft.net> Cc: "James E.J. Bottomley" <James.Bottomley@suse.de> Cc: David Airlie <airlied@linux.ie> Acked-by: Alexander Shishkin <virtuoso@slind.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'Documentation/sysrq.txt')
-rw-r--r--Documentation/sysrq.txt7
1 files changed, 5 insertions, 2 deletions
diff --git a/Documentation/sysrq.txt b/Documentation/sysrq.txt
index 5c17196c8fe9..312e3754e8c5 100644
--- a/Documentation/sysrq.txt
+++ b/Documentation/sysrq.txt
@@ -75,7 +75,7 @@ On all - write a character to /proc/sysrq-trigger. e.g.:
'f' - Will call oom_kill to kill a memory hog process.
-'g' - Used by kgdb on ppc and sh platforms.
+'g' - Used by kgdb (kernel debugger)
'h' - Will display help (actually any other key than those listed
here will display help. but 'h' is easy to remember :-)
@@ -110,12 +110,15 @@ On all - write a character to /proc/sysrq-trigger. e.g.:
'u' - Will attempt to remount all mounted filesystems read-only.
-'v' - Dumps Voyager SMP processor info to your console.
+'v' - Forcefully restores framebuffer console
+'v' - Causes ETM buffer dump [ARM-specific]
'w' - Dumps tasks that are in uninterruptable (blocked) state.
'x' - Used by xmon interface on ppc/powerpc platforms.
+'y' - Show global CPU Registers [SPARC-64 specific]
+
'z' - Dump the ftrace buffer
'0'-'9' - Sets the console log level, controlling which kernel messages