lkml.org 
[lkml]   [2008]   [Nov]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] ftrace: prevent recursion

On Thu, 27 Nov 2008, Lai Jiangshan wrote:

>
> if the resched flag was set before we entered, then don't reschedule.
>
> Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
> ---
> 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;


Ouch! Thanks, this patch should go straight to mainline. The version in
tip uses the new ftrace_preempt_disable which is not yet in mainline.

-- Steve



\
 
 \ /
  Last update: 2008-11-27 03:39    [W:0.338 / U:0.768 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site