diff options
author | Christoph Hellwig <hch@lst.de> | 2006-10-04 05:15:25 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 10:55:13 -0400 |
commit | 1d2c8eea698514cfaa53fc991b960791d09508e1 (patch) | |
tree | e6e2b2d491e7e7256862fcc493b81815cc966312 /net/core | |
parent | 88ca3b94e82e763ef90c8e57cacd51a3c143ea62 (diff) |
[PATCH] slab: clean up leak tracking ifdefs a little bit
- rename ____kmalloc to kmalloc_track_caller so that people have a chance
to guess what it does just from it's name. Add a comment describing it
for those who don't. Also move it after kmalloc in slab.h so people get
less confused when they are just looking for kmalloc - move things around
in slab.c a little to reduce the ifdef mess.
[penberg@cs.helsinki.fi: Fix up reversed #ifdef]
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Cc: Christoph Lameter <clameter@engr.sgi.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'net/core')
-rw-r--r-- | net/core/skbuff.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index c448c7f6fde2..3c23760c5827 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c | |||
@@ -156,7 +156,8 @@ struct sk_buff *__alloc_skb(unsigned int size, gfp_t gfp_mask, | |||
156 | 156 | ||
157 | /* Get the DATA. Size must match skb_add_mtu(). */ | 157 | /* Get the DATA. Size must match skb_add_mtu(). */ |
158 | size = SKB_DATA_ALIGN(size); | 158 | size = SKB_DATA_ALIGN(size); |
159 | data = ____kmalloc(size + sizeof(struct skb_shared_info), gfp_mask); | 159 | data = kmalloc_track_caller(size + sizeof(struct skb_shared_info), |
160 | gfp_mask); | ||
160 | if (!data) | 161 | if (!data) |
161 | goto nodata; | 162 | goto nodata; |
162 | 163 | ||