X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=net%2Fsocket.c;h=49917a1cac7d921f6fae418bb89a19a4e9e02a1f;hb=5f8fe4270e53d38421ba34c428c3b58933b48e50;hp=2a022c00d85c509e2346a8afac33eaa63154439a;hpb=193a6dec1c0246a80b6d0101e4f351ccf877bcac;p=~andy%2Flinux

diff --git a/net/socket.c b/net/socket.c
index 2a022c00d85..49917a1cac7 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -86,6 +86,7 @@
 #include <linux/audit.h>
 #include <linux/wireless.h>
 #include <linux/nsproxy.h>
+#include <linux/magic.h>
 
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
@@ -235,8 +236,6 @@ int move_addr_to_user(struct sockaddr *kaddr, int klen, void __user *uaddr,
 	return __put_user(klen, ulen);
 }
 
-#define SOCKFS_MAGIC 0x534F434B
-
 static struct kmem_cache *sock_inode_cachep __read_mostly;
 
 static struct inode *sock_alloc_inode(struct super_block *sb)
@@ -285,7 +284,7 @@ static int init_inodecache(void)
 	return 0;
 }
 
-static struct super_operations sockfs_ops = {
+static const struct super_operations sockfs_ops = {
 	.alloc_inode =	sock_alloc_inode,
 	.destroy_inode =sock_destroy_inode,
 	.statfs =	simple_statfs,