Merge tag 'v3.10.79' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / net / nonet.c

diff --git a/net/nonet.c b/net/nonet.c
index 1230f0ae832e9d52bdd50e4411a56e0ebd795510..b1a73fda9c12ed4225f13b3b9ce4051950510025 100644 (file)
--- a/net/nonet.c
+++ b/net/nonet.c
@@ -19,7 +19,8 @@ static int sock_no_open(struct inode *irrelevant, struct file *dontcare)
        return -ENXIO;
 }
 
-struct file_operations bad_sock_fops = {
+const struct file_operations bad_sock_fops = {
        .owner = THIS_MODULE,
        .open = sock_no_open,
+       .llseek = noop_llseek,
 };