diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2012-07-06 11:12:17 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-07-06 11:12:17 +0200 |
| commit | 35c2f48c66d9c1b8d794c3936c3be22aa7c89adb (patch) | |
| tree | de0233d45fec273920bce0bc8640465cbf439600 /kernel/trace/trace_functions_graph.c | |
| parent | jump label: Remove static_branch() (diff) | |
| parent | ring-buffer: Fix uninitialized read_stamp (diff) | |
| download | wireguard-linux-35c2f48c66d9c1b8d794c3936c3be22aa7c89adb.tar.xz wireguard-linux-35c2f48c66d9c1b8d794c3936c3be22aa7c89adb.zip | |
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core
Pull tracing updates from Steve Rostedt.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to '')
| -rw-r--r-- | kernel/trace/trace_functions_graph.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c index a7d2a4c653d8..ce27c8ba8d31 100644 --- a/kernel/trace/trace_functions_graph.c +++ b/kernel/trace/trace_functions_graph.c @@ -538,7 +538,7 @@ get_return_for_leaf(struct trace_iterator *iter, next = &data->ret; } else { - ring_iter = iter->buffer_iter[iter->cpu]; + ring_iter = trace_buffer_iter(iter, iter->cpu); /* First peek to compare current entry and the next one */ if (ring_iter) |