diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-05-08 21:29:27 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-05-08 21:29:27 -0400 |
commit | d585a021c0b10b0477d6b608c53e1feb8cde0507 (patch) | |
tree | 5ca059da1db7f15d4b29427644ad9c08270c885c /include/linux/net.h | |
parent | 84e5b0d00f8f84c4ae226be131d4bebbcee88bd3 (diff) | |
parent | 091bf7624d1c90cec9e578a18529f615213ff847 (diff) |
Merge commit 'v2.6.30-rc5' into next
Diffstat (limited to 'include/linux/net.h')
-rw-r--r-- | include/linux/net.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/linux/net.h b/include/linux/net.h index 4515efae4c39..4fc2ffd527f9 100644 --- a/include/linux/net.h +++ b/include/linux/net.h | |||
@@ -129,11 +129,15 @@ struct socket { | |||
129 | socket_state state; | 129 | socket_state state; |
130 | short type; | 130 | short type; |
131 | unsigned long flags; | 131 | unsigned long flags; |
132 | const struct proto_ops *ops; | 132 | /* |
133 | * Please keep fasync_list & wait fields in the same cache line | ||
134 | */ | ||
133 | struct fasync_struct *fasync_list; | 135 | struct fasync_struct *fasync_list; |
136 | wait_queue_head_t wait; | ||
137 | |||
134 | struct file *file; | 138 | struct file *file; |
135 | struct sock *sk; | 139 | struct sock *sk; |
136 | wait_queue_head_t wait; | 140 | const struct proto_ops *ops; |
137 | }; | 141 | }; |
138 | 142 | ||
139 | struct vm_area_struct; | 143 | struct vm_area_struct; |