diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-03-14 08:12:20 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-03-14 08:12:20 +0100 |
| commit | 0b34083f46c3784c6535dc9742dc13653ec1908d (patch) | |
| tree | fec964226f201b3aed008589b8eae7b0883d5bfb /kernel/trace/trace.c | |
| parent | aea8b5d1e5c5482e7cdda849dc16d728f7080289 (diff) | |
| parent | 740466bc89ad8bd5afcc8de220f715f62b21e365 (diff) | |
| download | kernel_goldelico_gta04-0b34083f46c3784c6535dc9742dc13653ec1908d.zip kernel_goldelico_gta04-0b34083f46c3784c6535dc9742dc13653ec1908d.tar.gz kernel_goldelico_gta04-0b34083f46c3784c6535dc9742dc13653ec1908d.tar.bz2 | |
Merge branch 'tip/perf/urgent-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/urgent
Pull tracing fixes from Steven Rostedt.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/trace/trace.c')
| -rw-r--r-- | kernel/trace/trace.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 1f835a8..53df283 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -704,7 +704,7 @@ __update_max_tr(struct trace_array *tr, struct task_struct *tsk, int cpu) void update_max_tr(struct trace_array *tr, struct task_struct *tsk, int cpu) { - struct ring_buffer *buf = tr->buffer; + struct ring_buffer *buf; if (trace_stop_count) return; @@ -719,6 +719,7 @@ update_max_tr(struct trace_array *tr, struct task_struct *tsk, int cpu) arch_spin_lock(&ftrace_max_lock); + buf = tr->buffer; tr->buffer = max_tr.buffer; max_tr.buffer = buf; |