aboutsummaryrefslogtreecommitdiff
path: root/kernel/trace/ftrace.c
diff options
context:
space:
mode:
authorSteven Rostedt <srostedt@redhat.com>2008-05-12 21:20:55 +0200
committerThomas Gleixner <tglx@linutronix.de>2008-05-23 21:15:42 +0200
commit07a267cdd2fd7d1de9455b1e36a1635ace7276c7 (patch)
tree886495b48c0e10866aa92e61e0dbd247a7e80e25 /kernel/trace/ftrace.c
parentc1d2327b36f2261ffa8ff7227321ba900c7eee7f (diff)
ftrace: add UNINTERRUPTIBLE state for kftraced on disable
When dynamic ftrace fails and sets itself disabled, the ftraced daemon will go back to sleep everytime it wakes up. The setting of the ftraced state to UNINTERRUPTIBLE is skipped in this process, and the daemon takes up 100% of the CPU. This patch makes sure the ftraced daemon sets itself to UNINTERRUPTIBLE in that loop. Signed-off-by: Steven Rostedt <srostedt@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/trace/ftrace.c')
-rw-r--r--kernel/trace/ftrace.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 281d97a3208..40f64f7cd85 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -630,10 +630,10 @@ static int ftraced(void *ignore)
{
unsigned long usecs;
- set_current_state(TASK_INTERRUPTIBLE);
-
while (!kthread_should_stop()) {
+ set_current_state(TASK_INTERRUPTIBLE);
+
/* check once a second */
schedule_timeout(HZ);
@@ -667,8 +667,6 @@ static int ftraced(void *ignore)
wake_up_interruptible(&ftraced_waiters);
ftrace_shutdown_replenish();
-
- set_current_state(TASK_INTERRUPTIBLE);
}
__set_current_state(TASK_RUNNING);
return 0;