diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-07-06 05:12:17 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-07-06 05:12:17 -0400 |
| commit | 35c2f48c66d9c1b8d794c3936c3be22aa7c89adb (patch) | |
| tree | de0233d45fec273920bce0bc8640465cbf439600 /kernel/trace/trace_functions_graph.c | |
| parent | 47fbc518a4b5c9a949f7cab8b14a00d3549bf138 (diff) | |
| parent | a5fb833172eca69136e9ee1ada778e404086ab8a (diff) | |
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 'kernel/trace/trace_functions_graph.c')
| -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, | |||
| 538 | next = &data->ret; | 538 | next = &data->ret; |
| 539 | } else { | 539 | } else { |
| 540 | 540 | ||
| 541 | ring_iter = iter->buffer_iter[iter->cpu]; | 541 | ring_iter = trace_buffer_iter(iter, iter->cpu); |
| 542 | 542 | ||
| 543 | /* First peek to compare current entry and the next one */ | 543 | /* First peek to compare current entry and the next one */ |
| 544 | if (ring_iter) | 544 | if (ring_iter) |