From b33802a6913f31290a916ef8eb3adfb536d6825a Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Wed, 2 Sep 2009 09:59:48 -0400 Subject: [PATCH] --- yaml --- r: 158477 b: refs/heads/master c: 41b6a95d693319f804607b559893fbbd27498548 h: refs/heads/master i: 158475: 2f01207a49287df0c154c31a6b19bf92fb7b9030 v: v3 --- [refs] | 2 +- trunk/kernel/trace/ring_buffer.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 226223473c53..7c0c9531f2ff 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8e254c1d183f0225ad21f9049641529e56cce4da +refs/heads/master: 41b6a95d693319f804607b559893fbbd27498548 diff --git a/trunk/kernel/trace/ring_buffer.c b/trunk/kernel/trace/ring_buffer.c index da2c59d8f486..79d6012bb1f1 100644 --- a/trunk/kernel/trace/ring_buffer.c +++ b/trunk/kernel/trace/ring_buffer.c @@ -3373,12 +3373,16 @@ void ring_buffer_reset_cpu(struct ring_buffer *buffer, int cpu) spin_lock_irqsave(&cpu_buffer->reader_lock, flags); + if (RB_WARN_ON(cpu_buffer, local_read(&cpu_buffer->committing))) + goto out; + __raw_spin_lock(&cpu_buffer->lock); rb_reset_cpu(cpu_buffer); __raw_spin_unlock(&cpu_buffer->lock); + out: spin_unlock_irqrestore(&cpu_buffer->reader_lock, flags); atomic_dec(&cpu_buffer->record_disabled);