diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-06-04 13:59:26 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-06-04 13:59:40 +0200 |
| commit | 64edbc562034f2ec3fce382cb208fab40586d005 (patch) | |
| tree | 7fbfaaea9467d14a1a6ac5667ce01be5ccb9b635 /kernel/trace/trace.c | |
| parent | 43bd1236234cacbc18d1476a9b57e7a306efddf5 (diff) | |
| parent | 0f6ce3de4ef6ff940308087c49760d068851c1a7 (diff) | |
Merge branch 'tracing/ftrace' into tracing/core
Merge reason: this mini-topic had outstanding problems that delayed
its merge, so it does not fast-forward.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/trace/trace.c')
| -rw-r--r-- | kernel/trace/trace.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index a3a8a87d7e9..cae34c69752 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) /* trace pipe does not show start of buffer */ cpumask_setall(iter->started); + if (trace_flags & TRACE_ITER_LATENCY_FMT) + iter->iter_flags |= TRACE_FILE_LAT_FMT; + iter->cpu_file = cpu_file; iter->tr = &global_trace; mutex_init(&iter->mutex); |