From b2b48578f0bac9c0c7db9780585431ab30f1b77f Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Tue, 25 Jan 2011 23:18:38 +0000
Subject: [PATCH] --- yaml --- r: 232834 b: refs/heads/master c:
 c2aa3665cf8510b1665ee2f5a9525cf7be6dec4f h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/net/core/skbuff.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 17c364283bd9..fb26008ed4fe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d3a9a685465986d7653c5abbc0b24681e7c44d7
+refs/heads/master: c2aa3665cf8510b1665ee2f5a9525cf7be6dec4f
diff --git a/trunk/net/core/skbuff.c b/trunk/net/core/skbuff.c
index 7cd1bc86d591..d883dcc78b6b 100644
--- a/trunk/net/core/skbuff.c
+++ b/trunk/net/core/skbuff.c
@@ -210,6 +210,7 @@ struct sk_buff *__alloc_skb(unsigned int size, gfp_t gfp_mask,
 	shinfo = skb_shinfo(skb);
 	memset(shinfo, 0, offsetof(struct skb_shared_info, dataref));
 	atomic_set(&shinfo->dataref, 1);
+	kmemcheck_annotate_variable(shinfo->destructor_arg);
 
 	if (fclone) {
 		struct sk_buff *child = skb + 1;