diff options
| author | Randy Dunlap <randy.dunlap@oracle.com> | 2008-12-25 01:06:57 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-26 10:27:22 +0100 |
| commit | 3871f2ffe53db3cef4fe0c18993ad9e6e0f69408 (patch) | |
| tree | e7e023ef0b643186a824d0726ac784565e83b29f | |
| parent | Merge branches 'tracing/ftrace', 'tracing/hw-branch-tracing' and 'tracing/rin... (diff) | |
| download | linux-3871f2ffe53db3cef4fe0c18993ad9e6e0f69408.tar.xz linux-3871f2ffe53db3cef4fe0c18993ad9e6e0f69408.zip | |
sysrq: fix ftrace help msg & doc.
Impact: update documentation and help messages
We have a conventional method of explicitly stating the
sysrq action key in a sysrq help message, so change
dump-ftrace-buffer to use that method and add it to
Documentation/sysrq.txt.
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | Documentation/sysrq.txt | 2 | ||||
| -rw-r--r-- | drivers/char/sysrq.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/sysrq.txt b/Documentation/sysrq.txt index 10a0263ebb3f..56b53e005d18 100644 --- a/Documentation/sysrq.txt +++ b/Documentation/sysrq.txt @@ -114,6 +114,8 @@ On all - write a character to /proc/sysrq-trigger. e.g.: 'x' - Used by xmon interface on ppc/powerpc platforms. +'z' - Dump the ftrace buffer + '0'-'9' - Sets the console log level, controlling which kernel messages will be printed to your console. ('0', for example would make it so that only emergency messages like PANICs or OOPSes would diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c index 94966edfb44d..785a08ef9a13 100644 --- a/drivers/char/sysrq.c +++ b/drivers/char/sysrq.c @@ -283,7 +283,7 @@ static void sysrq_ftrace_dump(int key, struct tty_struct *tty) } static struct sysrq_key_op sysrq_ftrace_dump_op = { .handler = sysrq_ftrace_dump, - .help_msg = "dumpZ-ftrace-buffer", + .help_msg = "dump-ftrace-buffer(Z)", .action_msg = "Dump ftrace buffer", .enable_mask = SYSRQ_ENABLE_DUMP, }; |