From aafe693860eb1d69676e2ea6e5b150ebbc2a6534 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Tue, 15 Sep 2009 02:39:20 -0700
Subject: [PATCH] --- yaml --- r: 162878 b: refs/heads/master c:
 29a020d35f629619c67fa5e32acaaac3f8a1ba90 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/include/linux/net.h | 5 +++++
 trunk/net/socket.c        | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 3d7ff11f7a39..8d6d162ef365 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 75c78500ddad74b229cd0691496b8549490496a2
+refs/heads/master: 29a020d35f629619c67fa5e32acaaac3f8a1ba90
diff --git a/trunk/include/linux/net.h b/trunk/include/linux/net.h
index 4fc2ffd527f9..9040a10584f7 100644
--- a/trunk/include/linux/net.h
+++ b/trunk/include/linux/net.h
@@ -57,6 +57,7 @@ typedef enum {
 #include <linux/random.h>
 #include <linux/wait.h>
 #include <linux/fcntl.h>	/* For O_CLOEXEC and O_NONBLOCK */
+#include <linux/kmemcheck.h>
 
 struct poll_table_struct;
 struct pipe_inode_info;
@@ -127,7 +128,11 @@ enum sock_shutdown_cmd {
  */
 struct socket {
 	socket_state		state;
+
+	kmemcheck_bitfield_begin(type);
 	short			type;
+	kmemcheck_bitfield_end(type);
+
 	unsigned long		flags;
 	/*
 	 * Please keep fasync_list & wait fields in the same cache line
diff --git a/trunk/net/socket.c b/trunk/net/socket.c
index 6d4716559047..2a022c00d85c 100644
--- a/trunk/net/socket.c
+++ b/trunk/net/socket.c
@@ -489,6 +489,7 @@ static struct socket *sock_alloc(void)
 
 	sock = SOCKET_I(inode);
 
+	kmemcheck_annotate_bitfield(sock, type);
 	inode->i_mode = S_IFSOCK | S_IRWXUGO;
 	inode->i_uid = current_fsuid();
 	inode->i_gid = current_fsgid();