From 338bd60f3977a62f57f550b2a063c9c3048a7e9b Mon Sep 17 00:00:00 2001 From: Frederic Weisbecker Date: Wed, 24 Dec 2008 01:43:25 +0100 Subject: [PATCH] --- yaml --- r: 140575 b: refs/heads/master c: 412d0bb553c0227191f1bfd06100f561600bff22 h: refs/heads/master i: 140573: acda390adda5e179a69d6ffaba045bb908ef138d 140571: 677c49cd8badc7d6609f2440d7119c6be418b82b 140567: 51898a072346e7628abda6f6605bf10e8feaf5cb 140559: bbddc4d24682489b9b7f6f63f6fe4124ccafb902 140543: 5428660bd97da6f8031b880b8a8955ffd3b93dc8 v: v3 --- [refs] | 2 +- trunk/Documentation/sysrq.txt | 2 -- trunk/drivers/char/sysrq.c | 2 +- trunk/kernel/trace/trace_functions_graph.c | 6 ++++++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b6036e6c62c2..c141b1a4efa2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3871f2ffe53db3cef4fe0c18993ad9e6e0f69408 +refs/heads/master: 412d0bb553c0227191f1bfd06100f561600bff22 diff --git a/trunk/Documentation/sysrq.txt b/trunk/Documentation/sysrq.txt index 56b53e005d18..10a0263ebb3f 100644 --- a/trunk/Documentation/sysrq.txt +++ b/trunk/Documentation/sysrq.txt @@ -114,8 +114,6 @@ 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/trunk/drivers/char/sysrq.c b/trunk/drivers/char/sysrq.c index 785a08ef9a13..94966edfb44d 100644 --- a/trunk/drivers/char/sysrq.c +++ b/trunk/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 = "dump-ftrace-buffer(Z)", + .help_msg = "dumpZ-ftrace-buffer", .action_msg = "Dump ftrace buffer", .enable_mask = SYSRQ_ENABLE_DUMP, }; diff --git a/trunk/kernel/trace/trace_functions_graph.c b/trunk/kernel/trace/trace_functions_graph.c index 4bf39fcae97a..bc7d90850be5 100644 --- a/trunk/kernel/trace/trace_functions_graph.c +++ b/trunk/kernel/trace/trace_functions_graph.c @@ -592,6 +592,12 @@ print_graph_comment(struct print_entry *trace, struct trace_seq *s, if (ent->flags & TRACE_FLAG_CONT) trace_seq_print_cont(s, iter); + /* Strip ending newline */ + if (s->buffer[s->len - 1] == '\n') { + s->buffer[s->len - 1] = '\0'; + s->len--; + } + ret = trace_seq_printf(s, " */\n"); if (!ret) return TRACE_TYPE_PARTIAL_LINE;