diff options
Diffstat (limited to 'kernel/trace/trace.c')
-rw-r--r-- | kernel/trace/trace.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 3ec2ee6f6560..fabb0033a9be 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c | |||
@@ -1556,7 +1556,7 @@ peek_next_entry(struct trace_iterator *iter, int cpu, u64 *ts) | |||
1556 | if (buf_iter) | 1556 | if (buf_iter) |
1557 | event = ring_buffer_iter_peek(buf_iter, ts); | 1557 | event = ring_buffer_iter_peek(buf_iter, ts); |
1558 | else | 1558 | else |
1559 | event = ring_buffer_peek(iter->tr->buffer, cpu, ts); | 1559 | event = ring_buffer_peek(iter->tr->buffer, cpu, ts, NULL); |
1560 | 1560 | ||
1561 | ftrace_enable_cpu(); | 1561 | ftrace_enable_cpu(); |
1562 | 1562 | ||
@@ -1635,7 +1635,7 @@ static void trace_consume(struct trace_iterator *iter) | |||
1635 | { | 1635 | { |
1636 | /* Don't allow ftrace to trace into the ring buffers */ | 1636 | /* Don't allow ftrace to trace into the ring buffers */ |
1637 | ftrace_disable_cpu(); | 1637 | ftrace_disable_cpu(); |
1638 | ring_buffer_consume(iter->tr->buffer, iter->cpu, &iter->ts); | 1638 | ring_buffer_consume(iter->tr->buffer, iter->cpu, &iter->ts, NULL); |
1639 | ftrace_enable_cpu(); | 1639 | ftrace_enable_cpu(); |
1640 | } | 1640 | } |
1641 | 1641 | ||