瀏覽代碼

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>
Marek Szyprowski 11 年之前
父節點
當前提交
cebf3e40b0
共有 1 個文件被更改,包括 0 次插入3 次删除
  1. 0 3
      arch/arm/mm/init.c

+ 0 - 3
arch/arm/mm/init.c

@@ -17,7 +17,6 @@
 #include <linux/nodemask.h>
 #include <linux/nodemask.h>
 #include <linux/initrd.h>
 #include <linux/initrd.h>
 #include <linux/of_fdt.h>
 #include <linux/of_fdt.h>
-#include <linux/of_reserved_mem.h>
 #include <linux/highmem.h>
 #include <linux/highmem.h>
 #include <linux/gfp.h>
 #include <linux/gfp.h>
 #include <linux/memblock.h>
 #include <linux/memblock.h>
@@ -379,8 +378,6 @@ void __init arm_memblock_init(struct meminfo *mi,
 	if (mdesc->reserve)
 	if (mdesc->reserve)
 		mdesc->reserve();
 		mdesc->reserve();
 
 
-	early_init_dt_scan_reserved_mem();
-
 	/*
 	/*
 	 * reserve memory for DMA contigouos allocations,
 	 * reserve memory for DMA contigouos allocations,
 	 * must come from DMA area inside low memory
 	 * must come from DMA area inside low memory