diff options
| author | Mark Brown <broonie@kernel.org> | 2018-07-13 13:22:34 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-07-13 13:22:34 +0100 |
| commit | 7afb85bf7a1ecc75778c158f660c37a7b9399f66 (patch) | |
| tree | 75e2390eebb85806dd6cf2d89e7f3f535dfee4dc /kernel | |
| parent | 7a3f6e8d2096d244ad7080673497d43f15e08bdb (diff) | |
| parent | 8ad23d861c38c89cb1a16d611b4f5a3c920b1a73 (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'kernel')
| -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); } |