diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2014-07-09 11:02:34 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2014-07-09 11:02:34 -0400 |
| commit | ca65ef1ab6b498b77985b9a3f5ab12c09bbf764e (patch) | |
| tree | bf51ef31302b8efeca7699347fbddd32cf34fbf4 /kernel/trace/trace.c | |
| parent | d048a8c7b509f35dd351e1415fe49fa99e4cb7ef (diff) | |
| parent | 099ed151675cd1d2dbeae1dac697975f6a68716d (diff) | |
| download | linux-ca65ef1ab6b498b77985b9a3f5ab12c09bbf764e.tar.gz linux-ca65ef1ab6b498b77985b9a3f5ab12c09bbf764e.tar.bz2 linux-ca65ef1ab6b498b77985b9a3f5ab12c09bbf764e.zip | |
Merge branch 'trace/ftrace/urgent' into trace/ftrace/core
Needed 099ed151675c "tracing: Remove ftrace_stop/start() from
reading the trace file" for the removal of ftrace_start/stop().
Diffstat (limited to 'kernel/trace/trace.c')
| -rw-r--r-- | kernel/trace/trace.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 822f6a0894f7..4a343db45d4e 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -1372,7 +1372,6 @@ void tracing_start(void) arch_spin_unlock(&global_trace.max_lock); - ftrace_start(); out: raw_spin_unlock_irqrestore(&global_trace.start_lock, flags); } @@ -1419,7 +1418,6 @@ void tracing_stop(void) struct ring_buffer *buffer; unsigned long flags; - ftrace_stop(); raw_spin_lock_irqsave(&global_trace.start_lock, flags); if (global_trace.stop_count++) goto out; |