aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace/trace.h
diff options
context:
space:
mode:
authorZhaolei <zhaolei@cn.fujitsu.com>2009-08-25 04:12:56 -0400
committerSteven Rostedt <rostedt@goodmis.org>2009-08-26 00:32:08 -0400
commit5079f3261ffd7fe4a537679af695f2328943a245 (patch)
tree1f9ab5128f37c3628979496610bc862b4a321cd6 /kernel/trace/trace.h
parent87a342f5db69d53ea70493bb1ec69c9047677038 (diff)
ftrace: Move setting of clock-source out of options
There are many clock sources for the tracing system but we can only enable/disable one at a time with the trace/options file. We can move the setting of clock-source out of options and add a separate file for it: # cat trace_clock [local] global # echo global > trace_clock # cat trace_clock local [global] Signed-off-by: Zhao Lei <zhaolei@cn.fujitsu.com> LKML-Reference: <4A939D08.6050604@cn.fujitsu.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'kernel/trace/trace.h')
-rw-r--r--kernel/trace/trace.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index 64dda5709cb9..654fd657bd03 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -568,6 +568,8 @@ trace_vprintk(unsigned long ip, const char *fmt, va_list args);
568 568
569extern unsigned long trace_flags; 569extern unsigned long trace_flags;
570 570
571extern int trace_clock_id;
572
571/* Standard output formatting function used for function return traces */ 573/* Standard output formatting function used for function return traces */
572#ifdef CONFIG_FUNCTION_GRAPH_TRACER 574#ifdef CONFIG_FUNCTION_GRAPH_TRACER
573extern enum print_line_t print_graph_function(struct trace_iterator *iter); 575extern enum print_line_t print_graph_function(struct trace_iterator *iter);
@@ -656,9 +658,8 @@ enum trace_iterator_flags {
656 TRACE_ITER_PRINTK_MSGONLY = 0x10000, 658 TRACE_ITER_PRINTK_MSGONLY = 0x10000,
657 TRACE_ITER_CONTEXT_INFO = 0x20000, /* Print pid/cpu/time */ 659 TRACE_ITER_CONTEXT_INFO = 0x20000, /* Print pid/cpu/time */
658 TRACE_ITER_LATENCY_FMT = 0x40000, 660 TRACE_ITER_LATENCY_FMT = 0x40000,
659 TRACE_ITER_GLOBAL_CLK = 0x80000, 661 TRACE_ITER_SLEEP_TIME = 0x80000,
660 TRACE_ITER_SLEEP_TIME = 0x100000, 662 TRACE_ITER_GRAPH_TIME = 0x100000,
661 TRACE_ITER_GRAPH_TIME = 0x200000,
662}; 663};
663 664
664/* 665/*