| Message ID | 20180105232054.27394-6-robh@kernel.org |
|---|---|
| State | Accepted |
| Commit | f7a6e01c8c90596c1871c9fae22e498cbf1c73a1 |
| Headers | show |
| Series | [1/7] of/fdt: use memblock_virt_alloc for early alloc | expand |
diff --git a/arch/nios2/kernel/prom.c b/arch/nios2/kernel/prom.c index 6688576b3a47..8d7446a4b475 100644 --- a/arch/nios2/kernel/prom.c +++ b/arch/nios2/kernel/prom.c @@ -42,11 +42,6 @@ void __init early_init_dt_add_memory_arch(u64 base, u64 size) } -void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align) -{ - return alloc_bootmem_align(size, align); -} - 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 nios2 specific early_init_dt_alloc_memory_arch function. Cc: Ley Foon Tan <lftan@altera.com> Cc: nios2-dev@lists.rocketboards.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/nios2/kernel/prom.c | 5 ----- 1 file changed, 5 deletions(-) -- 2.14.1