diff options
| author | Scott Wood <scottwood@freescale.com> | 2015-02-13 22:12:06 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2015-02-13 22:19:22 (GMT) |
| commit | 6faa2909871d8937cb2f79a10e1b21ffe193fac1 (patch) | |
| tree | f558a94f1553814cc122ab8d9e04c0ebad5262a5 /fs/timerfd.c | |
| parent | fcb2fb84301c673ee15ca04e7a2fc965712d49a0 (diff) | |
| download | linux-fsl-qoriq-6faa2909871d8937cb2f79a10e1b21ffe193fac1.tar.xz | |
Reset to 3.12.37
Diffstat (limited to 'fs/timerfd.c')
| -rw-r--r-- | fs/timerfd.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/timerfd.c b/fs/timerfd.c index d20e45a..9293121 100644 --- a/fs/timerfd.c +++ b/fs/timerfd.c @@ -380,10 +380,7 @@ static int do_timerfd_settime(int ufd, int flags, break; } spin_unlock_irq(&ctx->wqh.lock); - if (isalarm(ctx)) - hrtimer_wait_for_timer(&ctx->t.alarm.timer); - else - hrtimer_wait_for_timer(&ctx->t.tmr); + cpu_relax(); } /* |