From patchwork Fri Sep 3 16:27:08 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 63700 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 176C1B7159 for ; Sat, 4 Sep 2010 02:27:49 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755632Ab0ICQ1O (ORCPT ); Fri, 3 Sep 2010 12:27:14 -0400 Received: from mail-ew0-f46.google.com ([209.85.215.46]:32967 "EHLO mail-ew0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755204Ab0ICQ1M (ORCPT ); Fri, 3 Sep 2010 12:27:12 -0400 Received: by ewy23 with SMTP id 23so1232697ewy.19 for ; Fri, 03 Sep 2010 09:27:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:subject:from:to:cc :content-type:date:message-id:mime-version:x-mailer :content-transfer-encoding; bh=okvTSLeCtUT1BH19W7P2+X9B2oYaANsbtnRDTlMq0M4=; b=tchZEGhUmhnEE2GQ/e9pgdnJYSTwciFN1hlB/HyvLdUSxGKqHMIA+D0fEWtK+YAXPK nhpmDITSin5qOMrRS4+tBHmezdD59fOXcZ9h9w/W7HxK0Z7vaxL3ErTx0Ni3poYed1rX snLe82xEPIUpejypHpFlQo1Q67cyG0DzDHnQ4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:cc:content-type:date:message-id:mime-version :x-mailer:content-transfer-encoding; b=DENPeryAxcTHHhipeCKe55bKI++MiSSHRr4s2gEpyBuYrhi9FYVKcH2Ki5oR3tM/uo 6QR10zqA4eHCyKd4iikBkwAAQks092QYj5ApoDQ2KH0sDmSQMT2F6tlDUJGUTn+f9A5X JauBLC5R2n6gf1H1w7enA8Iw5WVhDt+4cX93s= Received: by 10.216.233.163 with SMTP id p35mr1160350weq.98.1283531231543; Fri, 03 Sep 2010 09:27:11 -0700 (PDT) Received: from [10.150.51.211] (gw0.net.jmsp.net [212.23.165.14]) by mx.google.com with ESMTPS id w1sm1341170weq.1.2010.09.03.09.27.10 (version=SSLv3 cipher=RC4-MD5); Fri, 03 Sep 2010 09:27:10 -0700 (PDT) Subject: [PATCH net-next-2.6] net: remove two kmemcheck annotations From: Eric Dumazet To: David Miller Cc: netdev Date: Fri, 03 Sep 2010 18:27:08 +0200 Message-ID: <1283531228.2453.1162.camel@edumazet-laptop> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org __alloc_skb() uses a memset() to clear all the beginning of skb, including bitfields contained in 'flags1' & 'flags2'. We dont need any more to use kmemcheck_annotate_bitfield() on these fields. However, we still need it for the clone part, which is not cleared. Signed-off-by: Eric Dumazet --- net/core/skbuff.c | 2 -- 1 file changed, 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 231dff0..c030cf8 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -202,8 +202,6 @@ struct sk_buff *__alloc_skb(unsigned int size, gfp_t gfp_mask, skb->data = data; skb_reset_tail_pointer(skb); skb->end = skb->tail + size; - kmemcheck_annotate_bitfield(skb, flags1); - kmemcheck_annotate_bitfield(skb, flags2); #ifdef NET_SKBUFF_DATA_USES_OFFSET skb->mac_header = ~0U; #endif