Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes

[karo-tx-linux.git] / mm / mempool.c

diff --git a/mm/mempool.c b/mm/mempool.c
index 455d468c3a5d6b5f3346a93477ffa8d61b2d6338..e209c98c72039b55afd1b5ca0b518e89094770a8 100644 (file)
--- a/mm/mempool.c
+++ b/mm/mempool.c
@@ -10,6 +10,7 @@
 
 #include <linux/mm.h>
 #include <linux/slab.h>
+#include <linux/kmemleak.h>
 #include <linux/export.h>
 #include <linux/mempool.h>
 #include <linux/blkdev.h>
@@ -222,6 +223,11 @@ repeat_alloc:
                spin_unlock_irqrestore(&pool->lock, flags);
                /* paired with rmb in mempool_free(), read comment there */
                smp_wmb();
+               /*
+                * Update the allocation stack trace as this is more useful
+                * for debugging.
+                */
+               kmemleak_update_trace(element);
                return element;
        }