diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-04-14 13:22:37 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-04-14 13:22:37 +0100 |
| commit | 6967963d6d5cac40a091d075326f0e3ccb95c58a (patch) | |
| tree | a9c29ac6450a7d1dc815f9d97f726ecd59271812 /include/linux/net.h | |
| parent | 9b1a88c7105f593cc61a7acd3c51fcf4bf7b8038 (diff) | |
| parent | 34e51ce60a210094bd66cf0a75dd8512247618ca (diff) | |
| download | kernel-crypto-6967963d6d5cac40a091d075326f0e3ccb95c58a.tar.gz kernel-crypto-6967963d6d5cac40a091d075326f0e3ccb95c58a.tar.xz kernel-crypto-6967963d6d5cac40a091d075326f0e3ccb95c58a.zip | |
Merge branch 'for-2.6.30' into for-2.6.31
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 4515efae4c3..4fc2ffd527f 100644 --- a/include/linux/net.h +++ b/include/linux/net.h @@ -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; |