---

yaml --- r: 3879 b: refs/heads/master c: f01b1b0 h: refs/heads/master i: 3877: 49739a0 3875: 44b4a4b 3871: 8fb6406 v: v3
git-mirror · Jun 29, 2005 · 40f974e · 40f974e
1 parent 5bcb0e2
commit 40f974e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b36bbb6c3d5244eaf52241ec69f79494137f2db0
+refs/heads/master: f01b1b0baa454825ed95c28d2a6a71bbf4510836
diff --git a/trunk/kernel/itimer.c b/trunk/kernel/itimer.c
@@ -153,11 +153,15 @@ int do_setitimer(int which, struct itimerval *value, struct itimerval *ovalue)
 
 	switch (which) {
 	case ITIMER_REAL:
+again:
 		spin_lock_irq(&tsk->sighand->siglock);
 		interval = tsk->signal->it_real_incr;
 		val = it_real_value(tsk->signal);
-		if (val)
-			del_timer_sync(&tsk->signal->real_timer);
+		/* We are sharing ->siglock with it_real_fn() */
+		if (try_to_del_timer_sync(&tsk->signal->real_timer) < 0) {
+			spin_unlock_irq(&tsk->sighand->siglock);
+			goto again;
+		}
 		tsk->signal->it_real_incr =
 			timeval_to_jiffies(&value->it_interval);
 		it_real_arm(tsk, timeval_to_jiffies(&value->it_value));