]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
Revert "ARM: init: add support for reserved memory defined by device tree"
authorMarek Szyprowski <m.szyprowski@samsung.com>
Fri, 11 Oct 2013 07:27:27 +0000 (09:27 +0200)
committerGrant Likely <grant.likely@linaro.org>
Tue, 15 Oct 2013 08:25:53 +0000 (09:25 +0100)
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>
arch/arm/mm/init.c

index febaee7ca57be76487290a2ac45c6cf74e53759c..18ec4c504abf908ac9ddca01a4458a8183c6cc95 100644 (file)
@@ -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