ARM: dt: use default early_init_dt_alloc_memory_arch
authorRob Herring <robh@kernel.org>
Thu, 3 Apr 2014 18:13:46 +0000 (13:13 -0500)
committerRob Herring <robh@kernel.org>
Wed, 30 Apr 2014 05:59:12 +0000 (00:59 -0500)
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 <robh@kernel.org>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: linux-arm-kernel@lists.infradead.org
Tested-by: Grant Likely <grant.likely@linaro.org>
arch/arm/kernel/devtree.c

index c7419a585ddc6e7fca602be71b3119582efc34ba..dff9cc0e9bd6e2cd968bf19b9a27385cf7e92484 100644 (file)
@@ -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;