aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChangli Gao <xiaosuo@gmail.com>2011-01-06 14:41:42 -0500
committerDavid S. Miller <davem@davemloft.net>2011-01-06 14:41:42 -0500
commit2ad0d9d413abc3380fc1d89a9da7f8db59d9746b (patch)
tree86bbbb8676ee52198867b4281ad52b1b3aecef3c
parentf88de8de5a8c8a8a73960d4432ceef2d38b7f86f (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>
-rw-r--r--include/linux/socket.h8
1 files changed, 2 insertions, 6 deletions
diff --git a/include/linux/socket.h b/include/linux/socket.h
index 86b652fabf6e..5f65f14c4f44 100644
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -30,12 +30,10 @@ struct cred;
30#define __sockaddr_check_size(size) \ 30#define __sockaddr_check_size(size) \
31 BUILD_BUG_ON(((size) > sizeof(struct __kernel_sockaddr_storage))) 31 BUILD_BUG_ON(((size) > sizeof(struct __kernel_sockaddr_storage)))
32 32
33#ifdef __KERNEL__ 33#ifdef CONFIG_PROC_FS
34# ifdef CONFIG_PROC_FS
35struct seq_file; 34struct seq_file;
36extern void socket_seq_show(struct seq_file *seq); 35extern void socket_seq_show(struct seq_file *seq);
37# endif 36#endif
38#endif /* __KERNEL__ */
39 37
40typedef unsigned short sa_family_t; 38typedef unsigned short sa_family_t;
41 39
@@ -311,7 +309,6 @@ struct ucred {
311/* IPX options */ 309/* IPX options */
312#define IPX_TYPE 1 310#define IPX_TYPE 1
313 311
314#ifdef __KERNEL__
315extern void cred_to_ucred(struct pid *pid, const struct cred *cred, struct ucred *ucred); 312extern void cred_to_ucred(struct pid *pid, const struct cred *cred, struct ucred *ucred);
316 313
317extern int memcpy_fromiovec(unsigned char *kdata, struct iovec *iov, int len); 314extern int memcpy_fromiovec(unsigned char *kdata, struct iovec *iov, int len);
@@ -333,6 +330,5 @@ struct timespec;
333 330
334extern int __sys_recvmmsg(int fd, struct mmsghdr __user *mmsg, unsigned int vlen, 331extern int __sys_recvmmsg(int fd, struct mmsghdr __user *mmsg, unsigned int vlen,
335 unsigned int flags, struct timespec *timeout); 332 unsigned int flags, struct timespec *timeout);
336#endif
337#endif /* not kernel and not glibc */ 333#endif /* not kernel and not glibc */
338#endif /* _LINUX_SOCKET_H */ 334#endif /* _LINUX_SOCKET_H */