1 files changed, 8 insertions, 14 deletions

diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c
index 0b99120d395c..4de3e57f723c 100644
--- a/kernel/trace/trace_functions_graph.c
+++ b/kernel/trace/trace_functions_graph.c
@@ -38,15 +38,6 @@ struct fgraph_data {
 
 #define TRACE_GRAPH_INDENT      2
 
-/* Flag options */
-#define TRACE_GRAPH_PRINT_OVERRUN       0x1
-#define TRACE_GRAPH_PRINT_CPU           0x2
-#define TRACE_GRAPH_PRINT_OVERHEAD      0x4
-#define TRACE_GRAPH_PRINT_PROC          0x8
-#define TRACE_GRAPH_PRINT_DURATION      0x10
-#define TRACE_GRAPH_PRINT_ABS_TIME      0x20
-#define TRACE_GRAPH_PRINT_IRQS          0x40
-
 static unsigned int max_depth;
 
 static struct tracer_opt trace_opts[] = {
@@ -64,11 +55,13 @@ static struct tracer_opt trace_opts[] = {
         { TRACER_OPT(funcgraph-abstime, TRACE_GRAPH_PRINT_ABS_TIME) },
         /* Display interrupts */
         { TRACER_OPT(funcgraph-irqs, TRACE_GRAPH_PRINT_IRQS) },
+        /* Display function name after trailing } */
+        { TRACER_OPT(funcgraph-tail, TRACE_GRAPH_PRINT_TAIL) },
         { } /* Empty entry */
 };
 
 static struct tracer_flags tracer_flags = {
-        /* Don't display overruns and proc by default */
+        /* Don't display overruns, proc, or tail by default */
         .val = TRACE_GRAPH_PRINT_CPU | TRACE_GRAPH_PRINT_OVERHEAD |
                TRACE_GRAPH_PRINT_DURATION | TRACE_GRAPH_PRINT_IRQS,
         .opts = trace_opts
@@ -1176,9 +1169,10 @@ print_graph_return(struct ftrace_graph_ret *trace, struct trace_seq *s,
          * If the return function does not have a matching entry,
          * then the entry was lost. Instead of just printing
          * the '}' and letting the user guess what function this
-         * belongs to, write out the function name.
+         * belongs to, write out the function name. Always do
+         * that if the funcgraph-tail option is enabled.
          */
-        if (func_match) {
+        if (func_match && !(flags & TRACE_GRAPH_PRINT_TAIL)) {
                 ret = trace_seq_puts(s, "}\n");
                 if (!ret)
                         return TRACE_TYPE_PARTIAL_LINE;
@@ -1476,7 +1470,8 @@ void graph_trace_close(struct trace_iterator *iter)
         }
 }
 
-static int func_graph_set_flag(u32 old_flags, u32 bit, int set)
+static int
+func_graph_set_flag(struct trace_array *tr, u32 old_flags, u32 bit, int set)
 {
         if (bit == TRACE_GRAPH_PRINT_IRQS)
                 ftrace_graph_skip_irqs = !set;
@@ -1504,7 +1499,6 @@ static struct tracer graph_trace __tracer_data = {
         .pipe_open      = graph_trace_open,
         .close          = graph_trace_close,
         .pipe_close     = graph_trace_close,
-        .wait_pipe      = poll_wait_pipe,
         .init           = graph_trace_init,
         .reset          = graph_trace_reset,
         .print_line     = print_graph_function,