diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-08-05 10:32:54 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-08-05 10:33:55 +0200 |
| commit | 3272cab4063467410802367a8d69f06c65b2a866 (patch) | |
| tree | 1c665f8572b0aab2a5343d32b5eaa6713669b04f /kernel/trace/trace_sched_wakeup.c | |
| parent | f629299b544b6cc12b4e3e85fec96f4ce5809482 (diff) | |
| parent | 140d0b2108faebc77c6523296e211e509cb9f5f9 (diff) | |
Merge branch 'linus' into perf/urgent
Merge reason: Include most of the merge window trees, to do fixes on top.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/trace/trace_sched_wakeup.c')
| -rw-r--r-- | kernel/trace/trace_sched_wakeup.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/trace/trace_sched_wakeup.c b/kernel/trace/trace_sched_wakeup.c index f029dd4fd2ca..e4a70c0c71b6 100644 --- a/kernel/trace/trace_sched_wakeup.c +++ b/kernel/trace/trace_sched_wakeup.c @@ -227,7 +227,9 @@ static void wakeup_trace_close(struct trace_iterator *iter) graph_trace_close(iter); } -#define GRAPH_TRACER_FLAGS (TRACE_GRAPH_PRINT_PROC) +#define GRAPH_TRACER_FLAGS (TRACE_GRAPH_PRINT_PROC | \ + TRACE_GRAPH_PRINT_ABS_TIME | \ + TRACE_GRAPH_PRINT_DURATION) static enum print_line_t wakeup_print_line(struct trace_iterator *iter) { |