diff options
| author | Lai Jiangshan <laijs@cn.fujitsu.com> | 2008-11-27 10:21:46 +0800 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-27 10:11:53 +0100 |
| commit | 4f5a7f40ddbae98569acbb99118a98570315579c (patch) | |
| tree | 82eca15746f525acc19fd9e3f33cb08c6c8bc3e6 /kernel/trace | |
| parent | fb91ee6cf5b8be5360acec577458e29ec7e97e5e (diff) | |
ftrace: prevent recursion
Impact: prevent unnecessary stack recursion
if the resched flag was set before we entered, then don't reschedule.
Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
Acked-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/trace')
| -rw-r--r-- | 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 f780e9552f91..668bbb5ef2bd 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; |