aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace/trace.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/trace/trace.c')
-rw-r--r--kernel/trace/trace.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index f4bb3800318b..3608f6cb2f7a 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -1310,7 +1310,7 @@ enum trace_file_type {
1310 TRACE_FILE_ANNOTATE = 2, 1310 TRACE_FILE_ANNOTATE = 2,
1311}; 1311};
1312 1312
1313static void trace_iterator_increment(struct trace_iterator *iter, int cpu) 1313static void trace_iterator_increment(struct trace_iterator *iter)
1314{ 1314{
1315 /* Don't allow ftrace to trace into the ring buffers */ 1315 /* Don't allow ftrace to trace into the ring buffers */
1316 ftrace_disable_cpu(); 1316 ftrace_disable_cpu();
@@ -1389,7 +1389,7 @@ static void *find_next_entry_inc(struct trace_iterator *iter)
1389 iter->ent = __find_next_entry(iter, &iter->cpu, &iter->ts); 1389 iter->ent = __find_next_entry(iter, &iter->cpu, &iter->ts);
1390 1390
1391 if (iter->ent) 1391 if (iter->ent)
1392 trace_iterator_increment(iter, iter->cpu); 1392 trace_iterator_increment(iter);
1393 1393
1394 return iter->ent ? iter : NULL; 1394 return iter->ent ? iter : NULL;
1395} 1395}