diff options
author | Rob Herring <robh@kernel.org> | 2014-04-03 14:13:46 -0400 |
---|---|---|
committer | Rob Herring <robh@kernel.org> | 2014-04-30 01:59:12 -0400 |
commit | 1f809b4b1221f35cd2995b5605c006a8903c340c (patch) | |
tree | 0c84c71b132e1951c5a9127fc9cf38077f99f9f4 /arch/arm/kernel/devtree.c | |
parent | edba274cdeaa84e2cf8a9a34fe7583b0e01edbab (diff) |
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/devtree.c')
-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 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) | |||
32 | arm_add_memory(base, size); | 32 | arm_add_memory(base, size); |
33 | } | 33 | } |
34 | 34 | ||
35 | void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align) | ||
36 | { | ||
37 | return memblock_virt_alloc(size, align); | ||
38 | } | ||
39 | |||
40 | void __init arm_dt_memblock_reserve(void) | 35 | void __init arm_dt_memblock_reserve(void) |
41 | { | 36 | { |
42 | u64 *reserve_map, base, size; | 37 | u64 *reserve_map, base, size; |