---

yaml --- r: 135211 b: refs/heads/master c: 8bdd663 h: refs/heads/master i: 135209: 2566d0a 135207: 4d8dd2d v: v3
git-mirror · Mar 16, 2009 · c016b25 · c016b25
1 parent fe9895e
commit c016b25
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git 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
@@ -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;