diff options
| author | Rob Herring <robh@kernel.org> | 2014-04-02 05:46:48 +0200 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2014-04-30 07:59:17 +0200 |
| commit | d1552ce449eb0a8d2f0bd6599da3a8a3d7f77a84 (patch) | |
| tree | 10e5d7505664ee5270eb8e0b895099decea030de /arch/arm/mm/init.c | |
| parent | of/fdt: create common debugfs (diff) | |
| download | linux-d1552ce449eb0a8d2f0bd6599da3a8a3d7f77a84.tar.xz linux-d1552ce449eb0a8d2f0bd6599da3a8a3d7f77a84.zip | |
of/fdt: move memreserve and dtb memory reservations into core
Move the /memreserve/ processing and dtb memory reservations into
early_init_fdt_scan_reserved_mem. This converts arm, arm64, and powerpc
as they are the only users of early_init_fdt_scan_reserved_mem.
memblock_reserve is safe to call on the same region twice, so the
reservation check for the dtb in powerpc 32-bit reservations is safe to
remove.
Signed-off-by: Rob Herring <robh@kernel.org>
Tested-by: Michal Simek <michal.simek@xilinx.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Tested-by: Grant Likely <grant.likely@linaro.org>
Tested-by: Stephen Chivers <schivers@csc.com>
Diffstat (limited to 'arch/arm/mm/init.c')
| -rw-r--r-- | arch/arm/mm/init.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index 2a77ba8796ae..928d596d9ab4 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c @@ -317,7 +317,6 @@ void __init arm_memblock_init(struct meminfo *mi, #endif arm_mm_memblock_reserve(); - arm_dt_memblock_reserve(); /* reserve any platform specific memblock areas */ if (mdesc->reserve) |