Merge ../linux-2.6

1 files changed, 10 insertions, 1 deletions

diff --git a/kernel/itimer.c b/kernel/itimer.c
index c2c05c4ff28d..379be2f8c84c 100644
--- a/kernel/itimer.c
+++ b/kernel/itimer.c
@@ -49,9 +49,11 @@ int do_getitimer(int which, struct itimerval *value)
 
         switch (which) {
         case ITIMER_REAL:
+                spin_lock_irq(&tsk->sighand->siglock);
                 value->it_value = itimer_get_remtime(&tsk->signal->real_timer);
                 value->it_interval =
                         ktime_to_timeval(tsk->signal->it_real_incr);
+                spin_unlock_irq(&tsk->sighand->siglock);
                 break;
         case ITIMER_VIRTUAL:
                 read_lock(&tasklist_lock);
@@ -150,18 +152,25 @@ int do_setitimer(int which, struct itimerval *value, struct itimerval *ovalue)
 
         switch (which) {
         case ITIMER_REAL:
+again:
+                spin_lock_irq(&tsk->sighand->siglock);
                 timer = &tsk->signal->real_timer;
-                hrtimer_cancel(timer);
                 if (ovalue) {
                         ovalue->it_value = itimer_get_remtime(timer);
                         ovalue->it_interval
                                 = ktime_to_timeval(tsk->signal->it_real_incr);
                 }
+                /* We are sharing ->siglock with it_real_fn() */
+                if (hrtimer_try_to_cancel(timer) < 0) {
+                        spin_unlock_irq(&tsk->sighand->siglock);
+                        goto again;
+                }
                 tsk->signal->it_real_incr =
                         timeval_to_ktime(value->it_interval);
                 expires = timeval_to_ktime(value->it_value);
                 if (expires.tv64 != 0)
                         hrtimer_start(timer, expires, HRTIMER_REL);
+                spin_unlock_irq(&tsk->sighand->siglock);
                 break;
         case ITIMER_VIRTUAL:
                 nval = timeval_to_cputime(&value->it_value);