aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/ftrace_event.h2
-rw-r--r--kernel/trace/trace.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/ftrace_event.h b/include/linux/ftrace_event.h
index bbf40f624fc8..5c093ffc655b 100644
--- a/include/linux/ftrace_event.h
+++ b/include/linux/ftrace_event.h
@@ -51,6 +51,7 @@ struct trace_iterator {
51 int cpu_file; 51 int cpu_file;
52 struct mutex mutex; 52 struct mutex mutex;
53 struct ring_buffer_iter *buffer_iter[NR_CPUS]; 53 struct ring_buffer_iter *buffer_iter[NR_CPUS];
54 unsigned long iter_flags;
54 55
55 /* The below is zeroed out in pipe_read */ 56 /* The below is zeroed out in pipe_read */
56 struct trace_seq seq; 57 struct trace_seq seq;
@@ -58,7 +59,6 @@ struct trace_iterator {
58 int cpu; 59 int cpu;
59 u64 ts; 60 u64 ts;
60 61
61 unsigned long iter_flags;
62 loff_t pos; 62 loff_t pos;
63 long idx; 63 long idx;
64 64
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index a3a8a87d7e91..cae34c69752f 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -2826,6 +2826,9 @@ static int tracing_open_pipe(struct inode *inode, struct file *filp)
2826 /* trace pipe does not show start of buffer */ 2826 /* trace pipe does not show start of buffer */
2827 cpumask_setall(iter->started); 2827 cpumask_setall(iter->started);
2828 2828
2829 if (trace_flags & TRACE_ITER_LATENCY_FMT)
2830 iter->iter_flags |= TRACE_FILE_LAT_FMT;
2831
2829 iter->cpu_file = cpu_file; 2832 iter->cpu_file = cpu_file;
2830 iter->tr = &global_trace; 2833 iter->tr = &global_trace;
2831 mutex_init(&iter->mutex); 2834 mutex_init(&iter->mutex);