| Message ID | 20180105232054.27394-5-robh@kernel.org |
|---|---|
| State | Accepted |
| Commit | a518a04eb0f5be616eebff567611e1fd9692b995 |
| Headers | show |
| Series | [1/7] of/fdt: use memblock_virt_alloc for early alloc | expand |
diff --git a/arch/mips/kernel/prom.c b/arch/mips/kernel/prom.c index 0dbcd152a1a9..89950b7bf536 100644 --- a/arch/mips/kernel/prom.c +++ b/arch/mips/kernel/prom.c @@ -44,11 +44,6 @@ void __init early_init_dt_add_memory_arch(u64 base, u64 size) return add_memory_region(base, size, BOOT_MEM_RAM); } -void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align) -{ - return __alloc_bootmem(size, align, __pa(MAX_DMA_ADDRESS)); -} - int __init early_init_dt_reserve_memory_arch(phys_addr_t base, phys_addr_t size, bool nomap) {
Now that the DT core code handles bootmem arches, we can remove the MIPS specific early_init_dt_alloc_memory_arch function. Cc: Ralf Baechle <ralf@linux-mips.org> Cc: linux-mips@linux-mips.org Signed-off-by: Rob Herring <robh@kernel.org> --- This is dependent on patch 1. Please ack and I'll take or apply after 4.16-rc1. arch/mips/kernel/prom.c | 5 ----- 1 file changed, 5 deletions(-) -- 2.14.1