Merge branch 'akpm' (patches from Andrew)

[linux-2.6-microblaze.git] / drivers / of / fdt.c

diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index ca2cfb3..ad85ff6 100644 (file)
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -26,6 +26,7 @@
 #include <linux/serial_core.h>
 #include <linux/sysfs.h>
 #include <linux/random.h>
+#include <linux/kmemleak.h>
 
 #include <asm/setup.h>  /* for COMMAND_LINE_SIZE */
 #include <asm/page.h>
@@ -524,9 +525,12 @@ static int __init __reserved_mem_reserve_reg(unsigned long node,
                size = dt_mem_next_cell(dt_root_size_cells, &prop);
 
                if (size &&
-                   early_init_dt_reserve_memory_arch(base, size, nomap) == 0)
+                   early_init_dt_reserve_memory_arch(base, size, nomap) == 0) {
                        pr_debug("Reserved memory: reserved region for node '%s': base %pa, size %lu MiB\n",
                                uname, &base, (unsigned long)(size / SZ_1M));
+                       if (!nomap)
+                               kmemleak_alloc_phys(base, size, 0, 0);
+               }
                else
                        pr_info("Reserved memory: failed to reserve memory for node '%s': base %pa, size %lu MiB\n",
                                uname, &base, (unsigned long)(size / SZ_1M));