diff options
author | Rob Herring <robh@kernel.org> | 2014-04-03 18:13:46 (GMT) |
---|---|---|
committer | Rob Herring <robh@kernel.org> | 2014-04-30 05:59:12 (GMT) |
commit | 1f809b4b1221f35cd2995b5605c006a8903c340c (patch) | |
tree | 0c84c71b132e1951c5a9127fc9cf38077f99f9f4 /arch/arm/kernel | |
parent | edba274cdeaa84e2cf8a9a34fe7583b0e01edbab (diff) | |
download | linux-1f809b4b1221f35cd2995b5605c006a8903c340c.tar.xz |
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 <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>
Diffstat (limited to 'arch/arm/kernel')
-rw-r--r-- | arch/arm/kernel/devtree.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/kernel/devtree.c b/arch/arm/kernel/devtree.c index c7419a5..dff9cc0 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; |