summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-02-17 22:01:09 +0100
committerIngo Molnar <mingo@elte.hu>2008-04-23 09:01:29 +0200
commit28f0d72271671548e0478215f94deeaf1aef2215 (patch)
treef8dddad59ac21a111f82b94a9bc57092234d7fba /net
parent8d0213838573e9a6e5f26d80ca867b8099e1fd62 (diff)
kmemcheck: fix-up (some bogus) reports
Signed-off-by: Vegard Nossum <vegardno@ifi.uio.no> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'net')
-rw-r--r--net/core/skbuff.c17
1 files changed, 7 insertions, 10 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 94448e6ee5ac..b7c6c5768f47 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -255,7 +255,8 @@ struct sk_buff *__netdev_alloc_skb(struct net_device *dev,
int node = dev_to_node(&dev->dev);
struct sk_buff *skb;
- skb = __alloc_skb(length + NET_SKB_PAD, gfp_mask, 0, node);
+ skb = __alloc_skb(length + NET_SKB_PAD, gfp_mask | __GFP_NOTRACK,
+ 0, node);
if (likely(skb)) {
skb_reserve(skb, NET_SKB_PAD);
skb->dev = dev;
@@ -2351,16 +2352,12 @@ EXPORT_SYMBOL_GPL(skb_segment);
void __init skb_init(void)
{
skbuff_head_cache = kmem_cache_create("skbuff_head_cache",
- sizeof(struct sk_buff),
- 0,
- SLAB_HWCACHE_ALIGN|SLAB_PANIC,
- NULL);
+ sizeof(struct sk_buff), 0,
+ SLAB_HWCACHE_ALIGN | SLAB_PANIC | SLAB_NOTRACK, NULL);
+
skbuff_fclone_cache = kmem_cache_create("skbuff_fclone_cache",
- (2*sizeof(struct sk_buff)) +
- sizeof(atomic_t),
- 0,
- SLAB_HWCACHE_ALIGN|SLAB_PANIC,
- NULL);
+ 2 * sizeof(struct sk_buff) + sizeof(atomic_t), 0,
+ SLAB_HWCACHE_ALIGN | SLAB_PANIC | SLAB_NOTRACK, NULL);
}
/**