summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Szyprowski <m.szyprowski@samsung.com>2013-10-11 07:27:27 (GMT)
committerGrant Likely <grant.likely@linaro.org>2013-10-15 08:25:53 (GMT)
commitcebf3e40b01bbf88d38dc954397414afaa280023 (patch)
treee67e61a281e53e7d61a220b53f5c55836cf43bd1
parentb920ecc826eacf7ad7dfeabc0cf74a8b88e3b7f5 (diff)
downloadlinux-cebf3e40b01bbf88d38dc954397414afaa280023.tar.xz
Revert "ARM: init: add support for reserved memory defined by device tree"
This reverts commit 10bcdfb8ba24760f715f0a700c3812747eddddf5. There is no consensus on the bindings for the reserved memory, so the code for handing it will be reverted. Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Grant Likely <grant.likely@linaro.org>
-rw-r--r--arch/arm/mm/init.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index febaee7..18ec4c5 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -17,7 +17,6 @@
#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>
@@ -379,8 +378,6 @@ void __init arm_memblock_init(struct meminfo *mi,
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