Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

[sfrench/cifs-2.6.git] / mm / slob.c

diff --git a/mm/slob.c b/mm/slob.c
index 4dd6516447f2258ac44c1a2baa024c6be38194d2..a2d4ab32198d85b9773926c27ba7fdd07adfbfe7 100644 (file)
--- a/mm/slob.c
+++ b/mm/slob.c
@@ -490,9 +490,8 @@ void *__kmalloc_node(size_t size, gfp_t gfp, int node)
                *m = size;
                ret = (void *)m + align;
 
-               kmemtrace_mark_alloc_node(KMEMTRACE_TYPE_KMALLOC,
-                                         _RET_IP_, ret,
-                                         size, size + align, gfp, node);
+               trace_kmalloc_node(_RET_IP_, ret,
+                                  size, size + align, gfp, node);
        } else {
                unsigned int order = get_order(size);
 
@@ -503,9 +502,8 @@ void *__kmalloc_node(size_t size, gfp_t gfp, int node)
                        page->private = size;
                }
 
-               kmemtrace_mark_alloc_node(KMEMTRACE_TYPE_KMALLOC,
-                                         _RET_IP_, ret,
-                                         size, PAGE_SIZE << order, gfp, node);
+               trace_kmalloc_node(_RET_IP_, ret,
+                                  size, PAGE_SIZE << order, gfp, node);
        }
 
        return ret;
@@ -516,6 +514,8 @@ void kfree(const void *block)
 {
        struct slob_page *sp;
 
+       trace_kfree(_RET_IP_, block);
+
        if (unlikely(ZERO_OR_NULL_PTR(block)))
                return;
 
@@ -526,8 +526,6 @@ void kfree(const void *block)
                slob_free(m, *m + align);
        } else
                put_page(&sp->page);
-
-       kmemtrace_mark_free(KMEMTRACE_TYPE_KMALLOC, _RET_IP_, block);
 }
 EXPORT_SYMBOL(kfree);
 
@@ -599,16 +597,14 @@ void *kmem_cache_alloc_node(struct kmem_cache *c, gfp_t flags, int node)
 
        if (c->size < PAGE_SIZE) {
                b = slob_alloc(c->size, flags, c->align, node);
-               kmemtrace_mark_alloc_node(KMEMTRACE_TYPE_CACHE,
-                                         _RET_IP_, b, c->size,
-                                         SLOB_UNITS(c->size) * SLOB_UNIT,
-                                         flags, node);
+               trace_kmem_cache_alloc_node(_RET_IP_, b, c->size,
+                                           SLOB_UNITS(c->size) * SLOB_UNIT,
+                                           flags, node);
        } else {
                b = slob_new_pages(flags, get_order(c->size), node);
-               kmemtrace_mark_alloc_node(KMEMTRACE_TYPE_CACHE,
-                                         _RET_IP_, b, c->size,
-                                         PAGE_SIZE << get_order(c->size),
-                                         flags, node);
+               trace_kmem_cache_alloc_node(_RET_IP_, b, c->size,
+                                           PAGE_SIZE << get_order(c->size),
+                                           flags, node);
        }
 
        if (c->ctor)
@@ -646,7 +642,7 @@ void kmem_cache_free(struct kmem_cache *c, void *b)
                __kmem_cache_free(b, c->size);
        }
 
-       kmemtrace_mark_free(KMEMTRACE_TYPE_CACHE, _RET_IP_, b);
+       trace_kmem_cache_free(_RET_IP_, b);
 }
 EXPORT_SYMBOL(kmem_cache_free);