From 856516b5c9320872baef33bac49d040675213065 Mon Sep 17 00:00:00 2001
From: Steven Rostedt <srostedt@redhat.com>
Date: Wed, 21 Jan 2009 15:24:56 -0500
Subject: [PATCH] --- yaml --- r: 140654 b: refs/heads/master c:
 97b17efe4537e11bf6669106cfe4ee2c5331b267 h: refs/heads/master v: v3

---
 [refs]                           |  2 +-
 trunk/kernel/trace/ring_buffer.c | 15 +++++++++++++++
 trunk/kernel/trace/trace.c       |  2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3090870a1c10..b56d532c6e9a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5bc4564b224c3d9fe6dddafa25f56059bd978231
+refs/heads/master: 97b17efe4537e11bf6669106cfe4ee2c5331b267
diff --git a/trunk/kernel/trace/ring_buffer.c b/trunk/kernel/trace/ring_buffer.c
index 0b9de5a3d699..890020e28a35 100644
--- a/trunk/kernel/trace/ring_buffer.c
+++ b/trunk/kernel/trace/ring_buffer.c
@@ -2266,9 +2266,24 @@ int ring_buffer_swap_cpu(struct ring_buffer *buffer_a,
 	if (buffer_a->pages != buffer_b->pages)
 		return -EINVAL;
 
+	if (ring_buffer_flags != RB_BUFFERS_ON)
+		return -EAGAIN;
+
+	if (atomic_read(&buffer_a->record_disabled))
+		return -EAGAIN;
+
+	if (atomic_read(&buffer_b->record_disabled))
+		return -EAGAIN;
+
 	cpu_buffer_a = buffer_a->buffers[cpu];
 	cpu_buffer_b = buffer_b->buffers[cpu];
 
+	if (atomic_read(&cpu_buffer_a->record_disabled))
+		return -EAGAIN;
+
+	if (atomic_read(&cpu_buffer_b->record_disabled))
+		return -EAGAIN;
+
 	/*
 	 * We can't do a synchronize_sched here because this
 	 * function can be called in atomic context.
diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c
index 220c264e3111..757ae6f7e648 100644
--- a/trunk/kernel/trace/trace.c
+++ b/trunk/kernel/trace/trace.c
@@ -415,7 +415,7 @@ update_max_tr_single(struct trace_array *tr, struct task_struct *tsk, int cpu)
 
 	ftrace_enable_cpu();
 
-	WARN_ON_ONCE(ret);
+	WARN_ON_ONCE(ret && ret != -EAGAIN);
 
 	__update_max_tr(tr, tsk, cpu);
 	__raw_spin_unlock(&ftrace_max_lock);