Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

[mv-sheeva.git] / drivers / vhost / net.c

diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index 17927b1f9334ead1e854ed539dea352f8718c589..861af4a8b79cd0b1968ffa91019934b460b61821 100644 (file)
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@ -877,6 +877,7 @@ static const struct file_operations vhost_net_fops = {
        .compat_ioctl   = vhost_net_compat_ioctl,
 #endif
        .open           = vhost_net_open,
+       .llseek         = noop_llseek,
 };
 
 static struct miscdevice vhost_net_misc = {