diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2010-08-16 17:17:30 +0200 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2010-08-16 17:17:30 +0200 |
| commit | d244b6bd41e09ecbb09c738cc2c108be227398c8 (patch) | |
| tree | 848c6a8a0d6f83929daf43d63e241dc8072066ac /kernel/trace/trace_functions_graph.c | |
| parent | Linux 2.6.36-rc1 (diff) | |
| parent | tracing: Sanitize value returned from write(trace_marker, "...", len) (diff) | |
| download | linux-d244b6bd41e09ecbb09c738cc2c108be227398c8.tar.xz linux-d244b6bd41e09ecbb09c738cc2c108be227398c8.zip | |
Merge branch 'tip/perf/urgent-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into trace/tip/perf/urgent-4
Conflicts:
kernel/trace/trace_events.c
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel/trace/trace_functions_graph.c')
| -rw-r--r-- | kernel/trace/trace_functions_graph.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c index 6bff23625781..6f233698518e 100644 --- a/kernel/trace/trace_functions_graph.c +++ b/kernel/trace/trace_functions_graph.c @@ -507,7 +507,15 @@ get_return_for_leaf(struct trace_iterator *iter, * if the output fails. */ data->ent = *curr; - data->ret = *next; + /* + * If the next event is not a return type, then + * we only care about what type it is. Otherwise we can + * safely copy the entire event. + */ + if (next->ent.type == TRACE_GRAPH_RET) + data->ret = *next; + else + data->ret.ent.type = next->ent.type; } } |