diff options
Diffstat (limited to 'kernel/trace/trace.c')
-rw-r--r-- | kernel/trace/trace.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index c8760ec0e463..0e91f43b6baf 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c | |||
@@ -30,7 +30,6 @@ | |||
30 | #include <linux/gfp.h> | 30 | #include <linux/gfp.h> |
31 | #include <linux/fs.h> | 31 | #include <linux/fs.h> |
32 | #include <linux/kprobes.h> | 32 | #include <linux/kprobes.h> |
33 | #include <linux/seq_file.h> | ||
34 | #include <linux/writeback.h> | 33 | #include <linux/writeback.h> |
35 | 34 | ||
36 | #include <linux/stacktrace.h> | 35 | #include <linux/stacktrace.h> |
@@ -1310,7 +1309,7 @@ enum trace_file_type { | |||
1310 | TRACE_FILE_ANNOTATE = 2, | 1309 | TRACE_FILE_ANNOTATE = 2, |
1311 | }; | 1310 | }; |
1312 | 1311 | ||
1313 | static void trace_iterator_increment(struct trace_iterator *iter, int cpu) | 1312 | static void trace_iterator_increment(struct trace_iterator *iter) |
1314 | { | 1313 | { |
1315 | /* Don't allow ftrace to trace into the ring buffers */ | 1314 | /* Don't allow ftrace to trace into the ring buffers */ |
1316 | ftrace_disable_cpu(); | 1315 | ftrace_disable_cpu(); |
@@ -1389,7 +1388,7 @@ static void *find_next_entry_inc(struct trace_iterator *iter) | |||
1389 | iter->ent = __find_next_entry(iter, &iter->cpu, &iter->ts); | 1388 | iter->ent = __find_next_entry(iter, &iter->cpu, &iter->ts); |
1390 | 1389 | ||
1391 | if (iter->ent) | 1390 | if (iter->ent) |
1392 | trace_iterator_increment(iter, iter->cpu); | 1391 | trace_iterator_increment(iter); |
1393 | 1392 | ||
1394 | return iter->ent ? iter : NULL; | 1393 | return iter->ent ? iter : NULL; |
1395 | } | 1394 | } |