diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-10 05:43:08 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-10 05:43:08 -0400 |
| commit | ec1bb60bbff0386c3ec25360e7a8c72f467a6ff1 (patch) | |
| tree | 893c04336763acd84d575fd713773b882e8bc8a6 /kernel/trace/trace.c | |
| parent | 5373fdbdc1dba69aa956098650f71b731d471885 (diff) | |
| parent | 37f5d732f34fa099676b2c52b8a57bab01a011de (diff) | |
Merge branch 'tracing/sysprof' into auto-ftrace-next
Diffstat (limited to 'kernel/trace/trace.c')
| -rw-r--r-- | kernel/trace/trace.c | 3 |
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) | |||
| 2913 | pr_warning("Could not create debugfs " | 2913 | pr_warning("Could not create debugfs " |
| 2914 | "'dyn_ftrace_total_info' entry\n"); | 2914 | "'dyn_ftrace_total_info' entry\n"); |
| 2915 | #endif | 2915 | #endif |
| 2916 | #ifdef CONFIG_SYSPROF_TRACER | ||
| 2917 | init_tracer_sysprof_debugfs(d_tracer); | ||
| 2918 | #endif | ||
| 2916 | } | 2919 | } |
| 2917 | 2920 | ||
| 2918 | static int trace_alloc_page(void) | 2921 | static int trace_alloc_page(void) |