aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace/trace.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-10 11:43:08 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-10 11:43:08 +0200
commitec1bb60bbff0386c3ec25360e7a8c72f467a6ff1 (patch)
tree893c04336763acd84d575fd713773b882e8bc8a6 /kernel/trace/trace.h
parentMerge branch 'tracing/mmiotrace' into auto-ftrace-next (diff)
parentMerge branch 'linus' into tracing/sysprof (diff)
downloadlinux-dev-ec1bb60bbff0386c3ec25360e7a8c72f467a6ff1.tar.xz
linux-dev-ec1bb60bbff0386c3ec25360e7a8c72f467a6ff1.zip
Merge branch 'tracing/sysprof' into auto-ftrace-next
Diffstat (limited to 'kernel/trace/trace.h')
-rw-r--r--kernel/trace/trace.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index 4966e6a964fe..8cb215b239d5 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -193,6 +193,8 @@ struct trace_iterator {
void tracing_reset(struct trace_array_cpu *data);
int tracing_open_generic(struct inode *inode, struct file *filp);
struct dentry *tracing_init_dentry(void);
+void init_tracer_sysprof_debugfs(struct dentry *d_tracer);
+
void ftrace(struct trace_array *tr,
struct trace_array_cpu *data,
unsigned long ip,
@@ -294,6 +296,10 @@ extern int trace_selftest_startup_wakeup(struct tracer *trace,
extern int trace_selftest_startup_sched_switch(struct tracer *trace,
struct trace_array *tr);
#endif
+#ifdef CONFIG_SYSPROF_TRACER
+extern int trace_selftest_startup_sysprof(struct tracer *trace,
+ struct trace_array *tr);
+#endif
#endif /* CONFIG_FTRACE_STARTUP_TEST */
extern void *head_page(struct trace_array_cpu *data);