diff options
-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.: | |||
114 | 114 | ||
115 | 'x' - Used by xmon interface on ppc/powerpc platforms. | 115 | 'x' - Used by xmon interface on ppc/powerpc platforms. |
116 | 116 | ||
117 | 'z' - Dump the ftrace buffer | ||
118 | |||
117 | '0'-'9' - Sets the console log level, controlling which kernel messages | 119 | '0'-'9' - Sets the console log level, controlling which kernel messages |
118 | will be printed to your console. ('0', for example would make | 120 | will be printed to your console. ('0', for example would make |
119 | it so that only emergency messages like PANICs or OOPSes would | 121 | 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) | |||
283 | } | 283 | } |
284 | static struct sysrq_key_op sysrq_ftrace_dump_op = { | 284 | static struct sysrq_key_op sysrq_ftrace_dump_op = { |
285 | .handler = sysrq_ftrace_dump, | 285 | .handler = sysrq_ftrace_dump, |
286 | .help_msg = "dumpZ-ftrace-buffer", | 286 | .help_msg = "dump-ftrace-buffer(Z)", |
287 | .action_msg = "Dump ftrace buffer", | 287 | .action_msg = "Dump ftrace buffer", |
288 | .enable_mask = SYSRQ_ENABLE_DUMP, | 288 | .enable_mask = SYSRQ_ENABLE_DUMP, |
289 | }; | 289 | }; |