diff options
author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2015-06-01 13:40:31 +0200 |
---|---|---|
committer | Catalin Marinas <catalin.marinas@arm.com> | 2015-06-02 16:31:25 +0100 |
commit | 24bbd929e6b9e62afd263c42b4318d3b603c956c (patch) | |
tree | 78658f1cf02b8c511195ad9a6c927b71ee143625 /arch/arm/mm/init.c | |
parent | d00a3810c16207d2541b7796a73cca5a24ea3742 (diff) | |
download | linux-24bbd929e6b9e62afd263c42b4318d3b603c956c.tar.gz linux-24bbd929e6b9e62afd263c42b4318d3b603c956c.tar.bz2 linux-24bbd929e6b9e62afd263c42b4318d3b603c956c.zip |
of/fdt: split off FDT self reservation from memreserve processing
This splits off the reservation of the memory occupied by the FDT
binary itself from the processing of the memory reservations it
contains. This is necessary because the physical address of the FDT,
which is needed to perform the reservation, may not be known to the
FDT driver core, i.e., it may be mapped outside the linear direct
mapping, in which case __pa() returns a bogus value.
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Acked-by: Rob Herring <robh@kernel.org>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch/arm/mm/init.c')
-rw-r--r-- | arch/arm/mm/init.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index be92fa0f2f35..8a63b4cdc0f2 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c @@ -268,6 +268,7 @@ void __init arm_memblock_init(const struct machine_desc *mdesc) if (mdesc->reserve) mdesc->reserve(); + early_init_fdt_reserve_self(); early_init_fdt_scan_reserved_mem(); /* reserve memory for DMA contiguous allocations */ |