diff options
author | Rob Herring <robh@kernel.org> | 2014-04-01 23:46:48 -0400 |
---|---|---|
committer | Rob Herring <robh@kernel.org> | 2014-04-30 01:59:17 -0400 |
commit | d1552ce449eb0a8d2f0bd6599da3a8a3d7f77a84 (patch) | |
tree | 10e5d7505664ee5270eb8e0b895099decea030de /arch/arm/include | |
parent | b0a6fb36a49f720c93c3da0b3f040e49e42435ad (diff) |
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/include')
-rw-r--r-- | arch/arm/include/asm/prom.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/include/asm/prom.h b/arch/arm/include/asm/prom.h index b681575ad3de..cd94ef2ef283 100644 --- a/arch/arm/include/asm/prom.h +++ b/arch/arm/include/asm/prom.h | |||
@@ -14,7 +14,6 @@ | |||
14 | #ifdef CONFIG_OF | 14 | #ifdef CONFIG_OF |
15 | 15 | ||
16 | extern const struct machine_desc *setup_machine_fdt(unsigned int dt_phys); | 16 | extern const struct machine_desc *setup_machine_fdt(unsigned int dt_phys); |
17 | extern void arm_dt_memblock_reserve(void); | ||
18 | extern void __init arm_dt_init_cpu_maps(void); | 17 | extern void __init arm_dt_init_cpu_maps(void); |
19 | 18 | ||
20 | #else /* CONFIG_OF */ | 19 | #else /* CONFIG_OF */ |
@@ -24,7 +23,6 @@ static inline const struct machine_desc *setup_machine_fdt(unsigned int dt_phys) | |||
24 | return NULL; | 23 | return NULL; |
25 | } | 24 | } |
26 | 25 | ||
27 | static inline void arm_dt_memblock_reserve(void) { } | ||
28 | static inline void arm_dt_init_cpu_maps(void) { } | 26 | static inline void arm_dt_init_cpu_maps(void) { } |
29 | 27 | ||
30 | #endif /* CONFIG_OF */ | 28 | #endif /* CONFIG_OF */ |