diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-03-05 10:21:49 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-05 10:21:49 +0100 |
commit | 53664738c122bfe8b0e489fddaf2ab265c9133c8 (patch) | |
tree | 8121a9fc4021e86499c404e0b1012a36e8d0b00e /kernel/trace/trace.h | |
parent | c4ef144a9d0803eb0a2d4110ae87e7f34e667ded (diff) | |
parent | e9d25fe6eaa2c720bb3ea661b660e58d54fa38bf (diff) | |
download | kernel_samsung_tuna-53664738c122bfe8b0e489fddaf2ab265c9133c8.zip kernel_samsung_tuna-53664738c122bfe8b0e489fddaf2ab265c9133c8.tar.gz kernel_samsung_tuna-53664738c122bfe8b0e489fddaf2ab265c9133c8.tar.bz2 |
Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace
Diffstat (limited to 'kernel/trace/trace.h')
-rw-r--r-- | kernel/trace/trace.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index 561bb5c..12cd119 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h @@ -651,7 +651,8 @@ enum trace_iterator_flags { TRACE_ITER_USERSTACKTRACE = 0x4000, TRACE_ITER_SYM_USEROBJ = 0x8000, TRACE_ITER_PRINTK_MSGONLY = 0x10000, - TRACE_ITER_CONTEXT_INFO = 0x20000 /* Print pid/cpu/time */ + TRACE_ITER_CONTEXT_INFO = 0x20000, /* Print pid/cpu/time */ + TRACE_ITER_LATENCY_FMT = 0x40000, }; /* |