diff options
| author | Nick Black <dank@qemfd.net> | 2009-09-22 16:43:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-23 07:39:28 -0700 |
| commit | 1fd7317d02ec03c6fdf072317841287933d06d24 (patch) | |
| tree | b7ac4d511896dbb21c1b76a27f6c4d5b4cb6c7bb /net | |
| parent | af91322ef3f29ae4114e736e2a72e28b4d619cf9 (diff) | |
| download | linux-3.10-1fd7317d02ec03c6fdf072317841287933d06d24.tar.gz linux-3.10-1fd7317d02ec03c6fdf072317841287933d06d24.tar.bz2 linux-3.10-1fd7317d02ec03c6fdf072317841287933d06d24.zip | |
Move magic numbers into magic.h
Move various magic-number definitions into magic.h.
Signed-off-by: Nick Black <dank@qemfd.net>
Acked-by: Pekka Enberg <penberg@cs.helsinki.fi>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Casey Schaufler <casey@schaufler-ca.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/socket.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/socket.c b/net/socket.c index 0ad02ae61a9..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) |