From: Rob Herring Date: Thu, 3 Apr 2014 18:13:46 +0000 (-0500) Subject: ARM: dt: use default early_init_dt_alloc_memory_arch X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1f809b4b1221f35cd2995b5605c006a8903c340c;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git ARM: dt: use default early_init_dt_alloc_memory_arch Now that ARM is using memblock instead of bootmem, the default version of early_init_dt_alloc_memory_arch can be used. Signed-off-by: Rob Herring Cc: Russell King Cc: linux-arm-kernel@lists.infradead.org Tested-by: Grant Likely --- diff --git a/arch/arm/kernel/devtree.c b/arch/arm/kernel/devtree.c index c7419a585ddc..dff9cc0e9bd6 100644 --- a/arch/arm/kernel/devtree.c +++ b/arch/arm/kernel/devtree.c @@ -32,11 +32,6 @@ void __init early_init_dt_add_memory_arch(u64 base, u64 size) arm_add_memory(base, size); } -void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align) -{ - return memblock_virt_alloc(size, align); -} - void __init arm_dt_memblock_reserve(void) { u64 *reserve_map, base, size;