From dab76e6a4f05b51a8702752fc34dbc4df13b28b8 Mon Sep 17 00:00:00 2001 From: Oleg Nesterov Date: Fri, 11 Jun 2010 20:04:46 +0200 Subject: [PATCH] --- yaml --- r: 205433 b: refs/heads/master c: 8d1f431cbec115a780cd551ab1b4955c125f8d31 h: refs/heads/master i: 205431: f0df0ea214a9ad880d61bb574a39e91ece2a3b29 v: v3 --- [refs] | 2 +- trunk/kernel/posix-cpu-timers.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index abecebd6237e..55b26480f358 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0bdd2ed4138ec04e09b4f8165981efc99e439f55 +refs/heads/master: 8d1f431cbec115a780cd551ab1b4955c125f8d31 diff --git a/trunk/kernel/posix-cpu-timers.c b/trunk/kernel/posix-cpu-timers.c index d5dbef5e89e6..f66bdd33a6c6 100644 --- a/trunk/kernel/posix-cpu-timers.c +++ b/trunk/kernel/posix-cpu-timers.c @@ -1287,7 +1287,10 @@ static inline int fastpath_timer_check(struct task_struct *tsk) if (sig->cputimer.running) { struct task_cputime group_sample; - thread_group_cputimer(tsk, &group_sample); + spin_lock(&sig->cputimer.lock); + group_sample = sig->cputimer.cputime; + spin_unlock(&sig->cputimer.lock); + if (task_cputime_expired(&group_sample, &sig->cputime_expires)) return 1; }