Merge branch 'core/locking' into tracing/ftrace

[linux-2.6-omap-h63xx.git] / mm / slob.c

diff --git a/mm/slob.c b/mm/slob.c
index f9cc24688232948cc0c1f70f5f1bc0319820e254..596152926a8dc859bfb4e554a4db1e1e3fb64f8e 100644 (file)
--- a/mm/slob.c
+++ b/mm/slob.c
@@ -466,6 +466,8 @@ void *__kmalloc_node(size_t size, gfp_t gfp, int node)
        int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
        void *ret;
 
+       lockdep_trace_alloc(flags);
+
        if (size < PAGE_SIZE - align) {
                if (!size)
                        return ZERO_SIZE_PTR;