summaryrefslogtreecommitdiffstats
path: root/kernel/trace/trace.c
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.c
parent5373fdbdc1dba69aa956098650f71b731d471885 (diff)
parent37f5d732f34fa099676b2c52b8a57bab01a011de (diff)
downloadblackbird-op-linux-ec1bb60bbff0386c3ec25360e7a8c72f467a6ff1.tar.gz
blackbird-op-linux-ec1bb60bbff0386c3ec25360e7a8c72f467a6ff1.zip
Merge branch 'tracing/sysprof' into auto-ftrace-next
Diffstat (limited to 'kernel/trace/trace.c')
-rw-r--r--kernel/trace/trace.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 4a875600733b..e46de641ea44 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -2913,6 +2913,9 @@ static __init void tracer_init_debugfs(void)
pr_warning("Could not create debugfs "
"'dyn_ftrace_total_info' entry\n");
#endif
+#ifdef CONFIG_SYSPROF_TRACER
+ init_tracer_sysprof_debugfs(d_tracer);
+#endif
}
static int trace_alloc_page(void)
OpenPOWER on IntegriCloud