Merge branch 'for-2.6.30' into for-2.6.31

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 {
         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;