diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-07-20 02:38:05 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-07-20 02:38:05 -0700 |
| commit | 1f9a2cdec9bc559b0691b614759b882acf8b4de6 (patch) | |
| tree | 6b8f0a34147afc66bbd9bb673f0723126d943462 /kernel/trace | |
| parent | 074aef20c516823ad4b1a37b0329a7fdf654e72d (diff) | |
| parent | df1c139ee74a8c6a2bc35112d02f32ef654dfafb (diff) | |
Merge "Merge android-4.4.140 (789274d) into msm-4.4"
Diffstat (limited to 'kernel/trace')
| -rw-r--r-- | kernel/trace/trace_functions_graph.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c index a804ee1b3ec6..55002f20950f 100644 --- a/kernel/trace/trace_functions_graph.c +++ b/kernel/trace/trace_functions_graph.c @@ -774,6 +774,7 @@ print_graph_entry_leaf(struct trace_iterator *iter, struct ftrace_graph_ret *graph_ret; struct ftrace_graph_ent *call; unsigned long long duration; + int cpu = iter->cpu; int i; graph_ret = &ret_entry->ret; @@ -782,7 +783,6 @@ print_graph_entry_leaf(struct trace_iterator *iter, if (data) { struct fgraph_cpu_data *cpu_data; - int cpu = iter->cpu; cpu_data = per_cpu_ptr(data->cpu_data, cpu); @@ -812,6 +812,9 @@ print_graph_entry_leaf(struct trace_iterator *iter, trace_seq_printf(s, "%ps();\n", (void *)call->func); + print_graph_irq(iter, graph_ret->func, TRACE_GRAPH_RET, + cpu, iter->ent->pid, flags); + return trace_handle_return(s); } |