Title: [8177] trunk/include/linux/socket.h: drop linux/socket.h changes since strace works without it
- Revision
- 8177
- Author
- vapier
- Date
- 2010-01-18 21:21:55 -0500 (Mon, 18 Jan 2010)
Log Message
drop linux/socket.h changes since strace works without it
Modified Paths
Diff
Modified: trunk/include/linux/socket.h (8176 => 8177)
--- trunk/include/linux/socket.h 2010-01-19 01:10:38 UTC (rev 8176)
+++ trunk/include/linux/socket.h 2010-01-19 02:21:55 UTC (rev 8177)
@@ -24,10 +24,12 @@
#include <linux/types.h> /* pid_t */
#include <linux/compiler.h> /* __user */
-#ifdef CONFIG_PROC_FS
+#ifdef __KERNEL__
+# ifdef CONFIG_PROC_FS
struct seq_file;
extern void socket_seq_show(struct seq_file *seq);
-#endif
+# endif
+#endif /* __KERNEL__ */
typedef unsigned short sa_family_t;
@@ -293,6 +295,7 @@
/* IPX options */
#define IPX_TYPE 1
+#ifdef __KERNEL__
extern int memcpy_fromiovec(unsigned char *kdata, struct iovec *iov, int len);
extern int memcpy_fromiovecend(unsigned char *kdata, const struct iovec *iov,
int offset, int len);
@@ -309,7 +312,6 @@
extern int move_addr_to_kernel(void __user *uaddr, int ulen, struct sockaddr *kaddr);
extern int put_cmsg(struct msghdr*, int level, int type, int len, void *data);
-#else /* !__KERNEL__ */
-# include <sys/socket.h>
#endif
+#endif /* not kernel and not glibc */
#endif /* _LINUX_SOCKET_H */
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
