From c016b25da13624990a2c0cf08b4bf9eef1e113be Mon Sep 17 00:00:00 2001
From: Eric Dumazet <dada1@cosmosbay.com>
Date: Sun, 15 Mar 2009 19:59:13 -0700
Subject: [PATCH] --- yaml --- r: 135211 b: refs/heads/master c:
 8bdd663aba341c15cd2fa9dbd7061b8b387964dc h: refs/heads/master i:   135209:
 2566d0a7d0de569b23e242cf4c86f54d9350b75d   135207:
 4d8dd2d31bd5109d7f6a0b89794ffe3185ed1bcb v: v3

---
 [refs]                    | 2 +-
 trunk/include/linux/net.h | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c0c31da6db19..9c35557d45dd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff4fbd43fe82de28710761f2cc2ed122d716483a
+refs/heads/master: 8bdd663aba341c15cd2fa9dbd7061b8b387964dc
diff --git a/trunk/include/linux/net.h b/trunk/include/linux/net.h
index 4515efae4c39..4fc2ffd527f9 100644
--- a/trunk/include/linux/net.h
+++ b/trunk/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;