Merge tag 'tag-chrome-platform-for-v5.4' of git://git.kernel.org/pub/scm/linux/kernel...

[linux.git] / fs / timerfd.c

diff --git a/fs/timerfd.c b/fs/timerfd.c
index 6a6fc8aa1de78381ae770c976d29274445a05ded..48305ba41e3c75d1a1b2cce8d9baa92a9d3cc259 100644 (file)
--- a/fs/timerfd.c
+++ b/fs/timerfd.c
@@ -471,7 +471,11 @@ static int do_timerfd_settime(int ufd, int flags,
                                break;
                }
                spin_unlock_irq(&ctx->wqh.lock);
-               cpu_relax();
+
+               if (isalarm(ctx))
+                       hrtimer_cancel_wait_running(&ctx->t.alarm.timer);
+               else
+                       hrtimer_cancel_wait_running(&ctx->t.tmr);
        }
 
        /*