Merge commit 'v2.6.29-rc7' into core/locking

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

diff --git a/mm/slob.c b/mm/slob.c
index 52bc8a2bd9efe71b0df16d068abcefe282a3dfc1..26aa464877b758fcbd36f184b434f4f9ef303428 100644 (file)
--- a/mm/slob.c
+++ b/mm/slob.c
@@ -464,6 +464,8 @@ void *__kmalloc_node(size_t size, gfp_t gfp, int node)
        unsigned int *m;
        int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
 
+       lockdep_trace_alloc(flags);
+
        if (size < PAGE_SIZE - align) {
                if (!size)
                        return ZERO_SIZE_PTR;