ARM: init: add support for reserved memory defined by device tree
authorMarek Szyprowski <m.szyprowski@samsung.com>
Fri, 9 Aug 2013 11:01:08 +0000 (13:01 +0200)
committerMarek Szyprowski <m.szyprowski@samsung.com>
Tue, 27 Aug 2013 08:53:45 +0000 (10:53 +0200)
Enable reserved memory initialization from device tree.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Michal Nazarewicz <mina86@mina86.com>
Acked-by: Tomasz Figa <t.figa@samsung.com>
arch/arm/mm/init.c

index 15225d829d7173b6169076ad063a388ceefe1248..6a2fe4453eeec203f0b88abd5febab9bf24755b4 100644 (file)
@@ -17,6 +17,7 @@
 #include <linux/nodemask.h>
 #include <linux/initrd.h>
 #include <linux/of_fdt.h>
+#include <linux/of_reserved_mem.h>
 #include <linux/highmem.h>
 #include <linux/gfp.h>
 #include <linux/memblock.h>
@@ -377,6 +378,8 @@ void __init arm_memblock_init(struct meminfo *mi, struct machine_desc *mdesc)
        if (mdesc->reserve)
                mdesc->reserve();
 
+       early_init_dt_scan_reserved_mem();
+
        /*
         * reserve memory for DMA contigouos allocations,
         * must come from DMA area inside low memory