summaryrefslogtreecommitdiff
path: root/include/linux/of_fdt.h
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2018-01-05 15:32:33 -0600
committerRob Herring <robh@kernel.org>2018-01-08 08:24:34 -0600
commit0fa1c579349fdd90173381712ad78aa99c09d38b (patch)
tree75cb0dbfbfad3df504ed14d52cca36a84683478b /include/linux/of_fdt.h
parentaf6074fc9aa4b29517375634189ada1869eea598 (diff)
of/fdt: use memblock_virt_alloc for early alloc
memblock_virt_alloc() works for both memblock and bootmem, so use it and make early_init_dt_alloc_memory_arch a static function. The arches using bootmem define early_init_dt_alloc_memory_arch as either: __alloc_bootmem(size, align, __pa(MAX_DMA_ADDRESS)) or: alloc_bootmem_align(size, align) Both of these evaluate to the same thing as does memblock_virt_alloc for bootmem. So we can disable the arch specific functions by making early_init_dt_alloc_memory_arch static and they can be removed in subsequent commits. Cc: Frank Rowand <frowand.list@gmail.com> Signed-off-by: Rob Herring <robh@kernel.org>
Diffstat (limited to 'include/linux/of_fdt.h')
-rw-r--r--include/linux/of_fdt.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h
index 08473f372e7f..b9cd9ebdf9b9 100644
--- a/include/linux/of_fdt.h
+++ b/include/linux/of_fdt.h
@@ -80,7 +80,6 @@ extern void early_init_dt_add_memory_arch(u64 base, u64 size);
extern int early_init_dt_mark_hotplug_memory_arch(u64 base, u64 size);
extern int early_init_dt_reserve_memory_arch(phys_addr_t base, phys_addr_t size,
bool no_map);
-extern void * early_init_dt_alloc_memory_arch(u64 size, u64 align);
extern u64 dt_mem_next_cell(int s, const __be32 **cellp);
/* Early flat tree scan hooks */