Merge branch '4.0.8-rt6'

[zynq/linux.git] / fs / timerfd.c

diff --git a/fs/timerfd.c b/fs/timerfd.c
index b94fa6c3c6ebe8c7308aea0052f3afacad9745c4..64fb8606623782949596c80138dd40a3b9322f90 100644 (file)
--- a/fs/timerfd.c
+++ b/fs/timerfd.c
@@ -450,7 +450,10 @@ static int do_timerfd_settime(int ufd, int flags,
                                break;
                }
                spin_unlock_irq(&ctx->wqh.lock);
-               cpu_relax();
+               if (isalarm(ctx))
+                       hrtimer_wait_for_timer(&ctx->t.alarm.timer);
+               else
+                       hrtimer_wait_for_timer(&ctx->t.tmr);
        }
 
        /*