From: Marek Szyprowski <m.szyprowski@samsung.com>
Date: Fri, 11 Oct 2013 07:27:27 +0000 (+0200)
Subject: Revert "ARM: init: add support for reserved memory defined by device tree"
X-Git-Tag: upstream/snapshot3+hdmi~4145^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cebf3e40b01bbf88d38dc954397414afaa280023;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

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>
---

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