[PATCH RT 2/2] ftrace: fix elevated preempt_count in wakeup-tracer

From: Gregory Haskins
Date: Tue Aug 19 2008 - 05:22:26 EST


Suggested by Steve Rostedt to fix an observed "+1" in the preempt-count

Signed-off-by: Gregory Haskins <ghaskins@xxxxxxxxxx>
---

kernel/trace/trace_sched_wakeup.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/kernel/trace/trace_sched_wakeup.c b/kernel/trace/trace_sched_wakeup.c
index c3a15bd..ae523fd 100644
--- a/kernel/trace/trace_sched_wakeup.c
+++ b/kernel/trace/trace_sched_wakeup.c
@@ -70,7 +70,9 @@ wakeup_tracer_call(unsigned long ip, unsigned long parent_ip)
if (task_cpu(wakeup_task) != cpu)
goto unlock;

+ preempt_enable_no_resched_notrace();
trace_function(tr, data, ip, parent_ip, flags);
+ preempt_disable_notrace();

unlock:
__raw_spin_unlock(&wakeup_lock);

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/