aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-06 08:57:51 -0500
committerIngo Molnar <mingo@elte.hu>2009-02-06 08:57:51 -0500
commit7d8e23df69820e6be42bcc41d441f4860e8c76f7 (patch)
treea39d2c85a0ba741c3fd497b9cd98136fcc4633b3 /include
parent4cd4c1b40d40447fb5e7ba80746c6d7ba91d7a53 (diff)
timers: split process wide cpu clocks/timers, remove spurious warning
Mike Galbraith reported that the new warning in thread_group_cputimer() triggers en masse with Amarok running. Oleg Nesterov observed: Can't fastpath_timer_check()->thread_group_cputimer() have the false warning too? Suppose we had the timer, then posix_cpu_timer_del() removes this timer, but task_cputime_zero(&sig->cputime_expires) still not true. Remove the spurious debug warning. Reported-by: Mike Galbraith <efault@gmx.de> Explained-by: Oleg Nesterov <oleg@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include')
-rw-r--r--include/linux/sched.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 082d7619b3a1..79392916d6c9 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -2208,8 +2208,6 @@ void thread_group_cputimer(struct task_struct *tsk, struct task_cputime *times)
2208 struct thread_group_cputimer *cputimer = &tsk->signal->cputimer; 2208 struct thread_group_cputimer *cputimer = &tsk->signal->cputimer;
2209 unsigned long flags; 2209 unsigned long flags;
2210 2210
2211 WARN_ON(!cputimer->running);
2212
2213 spin_lock_irqsave(&cputimer->lock, flags); 2211 spin_lock_irqsave(&cputimer->lock, flags);
2214 *times = cputimer->cputime; 2212 *times = cputimer->cputime;
2215 spin_unlock_irqrestore(&cputimer->lock, flags); 2213 spin_unlock_irqrestore(&cputimer->lock, flags);