OMAP: dmtimer: enable all timers to be wakeup events

[linux-2.6-omap-h63xx.git] / include / linux / net.h

diff --git a/include/linux/net.h b/include/linux/net.h
index 6dc14a240042eab5685fddfb0f357eaae9eecd9d..4fc2ffd527f9386e613afe1e54a552268a491eb5 100644 (file)
--- a/include/linux/net.h
+++ b/include/linux/net.h
@@ -40,7 +40,7 @@
 #define SYS_GETSOCKOPT 15              /* sys_getsockopt(2)            */
 #define SYS_SENDMSG    16              /* sys_sendmsg(2)               */
 #define SYS_RECVMSG    17              /* sys_recvmsg(2)               */
-#define SYS_PACCEPT    18              /* sys_paccept(2)               */
+#define SYS_ACCEPT4    18              /* sys_accept4(2)               */
 
 typedef enum {
        SS_FREE = 0,                    /* not allocated                */
@@ -100,7 +100,7 @@ enum sock_type {
  * remaining bits are used as flags. */
 #define SOCK_TYPE_MASK 0xf
 
-/* Flags for socket, socketpair, paccept */
+/* Flags for socket, socketpair, accept4 */
 #define SOCK_CLOEXEC   O_CLOEXEC
 #ifndef SOCK_NONBLOCK
 #define SOCK_NONBLOCK  O_NONBLOCK
@@ -129,11 +129,15 @@ struct socket {
        socket_state            state;
        short                   type;
        unsigned long           flags;
-       const struct proto_ops  *ops;
+       /*
+        * Please keep fasync_list & wait fields in the same cache line
+        */
        struct fasync_struct    *fasync_list;
+       wait_queue_head_t       wait;
+
        struct file             *file;
        struct sock             *sk;
-       wait_queue_head_t       wait;
+       const struct proto_ops  *ops;
 };
 
 struct vm_area_struct;
@@ -223,8 +227,6 @@ extern int       sock_map_fd(struct socket *sock, int flags);
 extern struct socket *sockfd_lookup(int fd, int *err);
 #define                     sockfd_put(sock) fput(sock->file)
 extern int          net_ratelimit(void);
-extern long         do_accept(int fd, struct sockaddr __user *upeer_sockaddr,
-                              int __user *upeer_addrlen, int flags);
 
 #define net_random()           random32()
 #define net_srandom(seed)      srandom32((__force u32)seed)