aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/ftrace_event.h
diff options
context:
space:
mode:
authorSteven Rostedt <srostedt@redhat.com>2009-06-01 15:16:05 -0400
committerSteven Rostedt <rostedt@goodmis.org>2009-06-01 23:26:02 -0400
commit112f38a7e36e9d688b389507136bf3af3e6d159b (patch)
treee63fd02a143c57b5a786351e4f2643f2104e2346 /include/linux/ftrace_event.h
parent1d080d6c3141623c92caaebe20e847cb99ccbb60 (diff)
tracing: make trace pipe recognize latency format flag
The trace_pipe did not recognize the latency format flag and would produce different output than the trace file. The problem was partly due that the trace flags in the iterator was not set as well as the trace_pipe zeros out part of the iterator (including the flags) to be able to use the same routines as the trace file. trace_flags of the iterator should not cause any problems when not zeroed out by for trace_pipe. Reported-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'include/linux/ftrace_event.h')
-rw-r--r--include/linux/ftrace_event.h2
1 files changed, 1 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