[PATCH v6 4/4] ARM: init: add support for reserved memory defined by device tree
From: m.szyprowski@samsung.com (Marek Szyprowski)
Date: 2013-08-19 15:04:29
Subsystem:
arm port, the rest · Maintainers:
Russell King, Linus Torvalds
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 <redacted> Acked-by: Tomasz Figa <redacted> --- arch/arm/mm/init.c | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 15225d8..6a2fe44 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c@@ -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
--
1.7.9.5