diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-02-17 14:11:15 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-02-17 14:11:15 +0100 |
| commit | 5beda5f6e4e4523e8dbe596bf163a01b45776808 (patch) | |
| tree | 61d1551430687b712325cdfec81b7800aa759076 /kernel/trace/trace.c | |
| parent | ba3dd36c6775264ee6e7354ba1aabcd6e86d7298 (diff) | |
| parent | 6752ab4a9c30d5411b2dfdb251a3f1cb18aae487 (diff) | |
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
Diffstat (limited to 'kernel/trace/trace.c')
| -rw-r--r-- | kernel/trace/trace.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index dc53ecb8058..8dc8da6733f 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -2710,6 +2710,10 @@ tracing_ctrl_write(struct file *filp, const char __user *ubuf, mutex_lock(&trace_types_lock); if (tracer_enabled ^ val) { + + /* Only need to warn if this is used to change the state */ + WARN_ONCE(1, "tracing_enabled is deprecated. Use tracing_on"); + if (val) { tracer_enabled = 1; if (current_trace->start) |