From f876e004024a651d5949e8ae5fb42116305f3014 Mon Sep 17 00:00:00 2001
From: Steven Rostedt <srostedt@redhat.com>
Date: Mon, 20 Apr 2009 13:32:44 -0400
Subject: [PATCH] --- yaml --- r: 146044 b: refs/heads/master c:
 e395898e98119085f666febbc7b631dd69bc637f h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/kernel/trace/ring_buffer.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a0d5b356185e..b05bc01843ac 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17487bfeb6cfb05920e6a9d5a54f345f2917b4e7
+refs/heads/master: e395898e98119085f666febbc7b631dd69bc637f
diff --git a/trunk/kernel/trace/ring_buffer.c b/trunk/kernel/trace/ring_buffer.c
index aa40ae92233b..a6997670cc46 100644
--- a/trunk/kernel/trace/ring_buffer.c
+++ b/trunk/kernel/trace/ring_buffer.c
@@ -1667,7 +1667,6 @@ static inline void rb_event_discard(struct ring_buffer_event *event)
 void ring_buffer_event_discard(struct ring_buffer_event *event)
 {
 	rb_event_discard(event);
-	trace_recursive_unlock();
 }
 EXPORT_SYMBOL_GPL(ring_buffer_event_discard);