diff options
author | Rob Herring <rob.herring@calxeda.com> | 2013-09-24 23:20:01 -0400 |
---|---|---|
committer | Rob Herring <rob.herring@calxeda.com> | 2013-10-09 12:38:19 -0400 |
commit | 068f6310b965d67d57f89ebf4c539e5933754366 (patch) | |
tree | 7f149f244a5d6451d4f4b4122e2a7fefe06ccf66 /arch/arm64/kernel/setup.c | |
parent | 7745fc1fec6ec9556e4cc36c21b0e02589078902 (diff) |
of: create default early_init_dt_add_memory_arch
Create a weak version of early_init_dt_add_memory_arch which uses
memblock. This will unify all architectures except ones with custom
memory bank structs.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Jonas Bonn <jonas@southpole.se>
Acked-by: Grant Likely <grant.likely@linaro.org>
Cc: linux-arm-kernel@lists.infradead.org
Cc: microblaze-uclinux@itee.uq.edu.au
Cc: linux@lists.openrisc.net
Cc: devicetree@vger.kernel.org
Diffstat (limited to 'arch/arm64/kernel/setup.c')
-rw-r--r-- | arch/arm64/kernel/setup.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index 4a5f6243ade2..7feb0c97d0dd 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c | |||
@@ -147,24 +147,6 @@ static void __init setup_machine_fdt(phys_addr_t dt_phys) | |||
147 | pr_info("Machine: %s\n", machine_name); | 147 | pr_info("Machine: %s\n", machine_name); |
148 | } | 148 | } |
149 | 149 | ||
150 | void __init early_init_dt_add_memory_arch(u64 base, u64 size) | ||
151 | { | ||
152 | base &= PAGE_MASK; | ||
153 | size &= PAGE_MASK; | ||
154 | if (base + size < PHYS_OFFSET) { | ||
155 | pr_warning("Ignoring memory block 0x%llx - 0x%llx\n", | ||
156 | base, base + size); | ||
157 | return; | ||
158 | } | ||
159 | if (base < PHYS_OFFSET) { | ||
160 | pr_warning("Ignoring memory range 0x%llx - 0x%llx\n", | ||
161 | base, PHYS_OFFSET); | ||
162 | size -= PHYS_OFFSET - base; | ||
163 | base = PHYS_OFFSET; | ||
164 | } | ||
165 | memblock_add(base, size); | ||
166 | } | ||
167 | |||
168 | /* | 150 | /* |
169 | * Limit the memory size that was specified via FDT. | 151 | * Limit the memory size that was specified via FDT. |
170 | */ | 152 | */ |