summaryrefslogtreecommitdiff
path: root/arch/arm/mm
diff options
context:
space:
mode:
authorMarek Szyprowski <m.szyprowski@samsung.com>2013-08-09 13:01:08 +0200
committerChanho Park <chanho61.park@samsung.com>2014-11-18 11:42:30 +0900
commitc81bfd9368ddc88906fb4f8def1577fc4cb709e9 (patch)
tree82698333d73c8850f562cbb14b90df8b158850b0 /arch/arm/mm
parentab84897c9691256ed00a57b408725f7be09945bf (diff)
downloadlinux-3.10-c81bfd9368ddc88906fb4f8def1577fc4cb709e9.tar.gz
linux-3.10-c81bfd9368ddc88906fb4f8def1577fc4cb709e9.tar.bz2
linux-3.10-c81bfd9368ddc88906fb4f8def1577fc4cb709e9.zip
ARM: init: add support for reserved memory defined by device tree
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>
Diffstat (limited to 'arch/arm/mm')
-rw-r--r--arch/arm/mm/init.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 0ecc43fd622..2d2f919d789 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>
@@ -376,6 +377,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