[PATCH 1/1] ring-buffer: prevent recursion

[Steven Rostedt <rostedt@goodmis.org>]

[-- Attachment #1: 0001-ring-buffer-prevent-recursion.patch --]
[-- Type: text/plain, Size: 772 bytes --]

From: Lai Jiangshan <laijs@cn.fujitsu.com>

Impact: fix to recursion in function tracer with schedule

If the resched flag was set before we entered, then don't reschedule.

Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
 kernel/trace/ring_buffer.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index f780e95..668bbb5 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -1215,7 +1215,7 @@ ring_buffer_lock_reserve(struct ring_buffer *buffer,
 
  out:
 	if (resched)
-		preempt_enable_notrace();
+		preempt_enable_no_resched_notrace();
 	else
 		preempt_enable_notrace();
 	return NULL;
-- 
1.5.6.5

--