Merge branch 'master'; commit 'v2.6.39-rc3' into next

[firefly-linux-kernel-4.4.55.git] / fs / timerfd.c

diff --git a/fs/timerfd.c b/fs/timerfd.c
index b86ab8eff79ac8f36ace73c604e554cb4efa8820..8c4fc1425b3eff171bd37b9e1bed290b93473e11 100644 (file)
--- a/fs/timerfd.c
+++ b/fs/timerfd.c
@@ -144,6 +144,7 @@ static const struct file_operations timerfd_fops = {
        .release        = timerfd_release,
        .poll           = timerfd_poll,
        .read           = timerfd_read,
+       .llseek         = noop_llseek,
 };
 
 static struct file *timerfd_fget(int fd)