Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph...

[~andy/linux] / arch / arm / kernel / devtree.c

diff --git a/arch/arm/kernel/devtree.c b/arch/arm/kernel/devtree.c
index 34d5fd585bbb1d472015838c2665dea5aad376f7..f751714d52c1f7dd5d4e87542bfadb012fcf1ca0 100644 (file)
--- a/arch/arm/kernel/devtree.c
+++ b/arch/arm/kernel/devtree.c
@@ -33,7 +33,7 @@ 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);
+       return memblock_virt_alloc(size, align);
 }
 
 void __init arm_dt_memblock_reserve(void)