---

yaml --- r: 205433 b: refs/heads/master c: 8d1f431 h: refs/heads/master i: 205431: f0df0ea v: v3
git-mirror · Jun 18, 2010 · dab76e6 · dab76e6
1 parent 512df70
commit dab76e6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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;
 	}