Skip to content

Commit

Permalink
Revert "ARM: init: add support for reserved memory defined by device …
Browse files Browse the repository at this point in the history
…tree"

This reverts commit 10bcdfb. 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>
  • Loading branch information
Marek Szyprowski authored and Grant Likely committed Oct 15, 2013
1 parent b920ecc commit cebf3e4
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions arch/arm/mm/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit cebf3e4

Please sign in to comment.