Commit-ID: e395898e98119085f666febbc7b631dd69bc637f
Gitweb: http://git.kernel.org/tip/e395898e98119085f666febbc7b631dd69bc637f
Author: Steven Rostedt <srostedt@xxxxxxxxxx>
AuthorDate: Mon, 20 Apr 2009 13:32:44 -0400
Committer: Steven Rostedt <rostedt@xxxxxxxxxxx>
CommitDate: Mon, 20 Apr 2009 13:32:44 -0400
tracing: remove recursive test from ring_buffer_event_discard
The ring_buffer_event_discard is not tied to ring_buffer_lock_reserve.
It can be called inside or outside the reserve/commit. Even if it
is called inside the reserve/commit the commit part must also be called.
Only ring_buffer_discard_commit can be used as a replacement for
ring_buffer_unlock_commit.
This patch removes the trace_recursive_unlock from ring_buffer_event_discard
since it would be the wrong place to do so.
[Impact: prevent breakage in trace recursive testing ]
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Signed-off-by: Steven Rostedt <rostedt@xxxxxxxxxxx>
---
kernel/trace/ring_buffer.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index aa40ae9..a699767 100644
--- a/kernel/trace/ring_buffer.c
+++ b/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);
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|