summaryrefslogtreecommitdiffstats
path: root/arch/arm64/mm/init.c
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@linaro.org>2014-03-19 15:01:53 +0000
committerGrant Likely <grant.likely@linaro.org>2014-03-19 15:01:53 +0000
commitca3992bc0c12e381deb84cd47ec1181a6d34660d (patch)
tree162006e862b9d856fdce1b19f0ba117dafb6ca58 /arch/arm64/mm/init.c
parent0829f6d1f69e4f2fae4062987ae6531a9af1a2e3 (diff)
parent2040b52768ebab6e7bd73af0dc63703269c62f17 (diff)
Merge branch 'devicetree/next-reserved-mem' into devicetree/next
Diffstat (limited to 'arch/arm64/mm/init.c')
-rw-r--r--arch/arm64/mm/init.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
index d0b4c2efda9..3fb8d50dfda 100644
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@ -160,6 +160,7 @@ void __init arm64_memblock_init(void)
memblock_reserve(base, size);
}
+ early_init_fdt_scan_reserved_mem();
dma_contiguous_reserve(0);
memblock_allow_resize();