Apply preempt_rt patch-4.9-rt1.patch.xz

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

diff --git a/fs/timerfd.c b/fs/timerfd.c
index 9ae4abb4110b84ef286facc88e66be9d954a021d..8644b67c48fde59e6a272b6ec13995b236817c37 100644 (file)
--- a/fs/timerfd.c
+++ b/fs/timerfd.c
@@ -460,7 +460,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);
        }
 
        /*