diff options
| author | Mark Brown <broonie@kernel.org> | 2018-07-13 13:15:50 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-07-13 13:15:50 +0100 |
| commit | 8ad23d861c38c89cb1a16d611b4f5a3c920b1a73 (patch) | |
| tree | f97a38a313419a12793ae074a2d585bad576043c /kernel | |
| parent | e96c5550070c189a8ccb26dc6eae76ee8eef833d (diff) | |
| parent | d6bc7e610ab98da569362b0b64bb20dafee1fcb9 (diff) | |
Merge tag 'v4.4.140' into linux-linaro-lsk-v4.4
This is the 4.4.140 stable release
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 7fd6f5a26143..e212ec4cfb4e 100644 --- a/kernel/trace/trace_functions_graph.c +++ b/kernel/trace/trace_functions_graph.c @@ -768,6 +768,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; @@ -776,7 +777,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); @@ -806,6 +806,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); } |