diff options
| author | Changli Gao <xiaosuo@gmail.com> | 2011-01-06 11:41:42 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-06 11:41:42 -0800 |
| commit | 2ad0d9d413abc3380fc1d89a9da7f8db59d9746b (patch) | |
| tree | 86bbbb8676ee52198867b4281ad52b1b3aecef3c /include/linux/socket.h | |
| parent | f88de8de5a8c8a8a73960d4432ceef2d38b7f86f (diff) | |
net: remove the duplicate #ifdef __KERNEL__
Since we are already in #ifdef __KERNEL__, we don't need to check it
again.
Signed-off-by: Changli Gao <xiaosuo@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/socket.h')
| -rw-r--r-- | include/linux/socket.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/include/linux/socket.h b/include/linux/socket.h index 86b652fabf6..5f65f14c4f4 100644 --- a/include/linux/socket.h +++ b/include/linux/socket.h @@ -30,12 +30,10 @@ struct cred; #define __sockaddr_check_size(size) \ BUILD_BUG_ON(((size) > sizeof(struct __kernel_sockaddr_storage))) -#ifdef __KERNEL__ -# ifdef CONFIG_PROC_FS +#ifdef CONFIG_PROC_FS struct seq_file; extern void socket_seq_show(struct seq_file *seq); -# endif -#endif /* __KERNEL__ */ +#endif typedef unsigned short sa_family_t; @@ -311,7 +309,6 @@ struct ucred { /* IPX options */ #define IPX_TYPE 1 -#ifdef __KERNEL__ extern void cred_to_ucred(struct pid *pid, const struct cred *cred, struct ucred *ucred); extern int memcpy_fromiovec(unsigned char *kdata, struct iovec *iov, int len); @@ -333,6 +330,5 @@ struct timespec; extern int __sys_recvmmsg(int fd, struct mmsghdr __user *mmsg, unsigned int vlen, unsigned int flags, struct timespec *timeout); -#endif #endif /* not kernel and not glibc */ #endif /* _LINUX_SOCKET_H */ |