Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / fs / timerfd.c

diff --git a/fs/timerfd.c b/fs/timerfd.c
index 0510717f3a53525ad47003631c4a3e4c8dce5eb7..cdad49da3ff710e6fd2cc1adf4bf4877623af670 100644 (file)
--- a/fs/timerfd.c
+++ b/fs/timerfd.c
@@ -237,7 +237,7 @@ static __poll_t timerfd_poll(struct file *file, poll_table *wait)
 
        spin_lock_irqsave(&ctx->wqh.lock, flags);
        if (ctx->ticks)
-               events |= POLLIN;
+               events |= EPOLLIN;
        spin_unlock_irqrestore(&ctx->wqh.lock, flags);
 
        return events;