diff options
| author | Geert Uytterhoeven <geert+renesas@glider.be> | 2021-08-11 11:53:37 +0300 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2021-08-15 17:56:03 +0300 |
| commit | 39c6b3a3dd118173c6da32daacd2eed8cfc5951d (patch) | |
| tree | 0ff0fa1e683ea27c83eab87af2095a11b5b943b7 /drivers/of | |
| parent | 18250b43f7b6d0085724bf6fc186f9a107066068 (diff) | |
| download | linux-39c6b3a3dd118173c6da32daacd2eed8cfc5951d.tar.xz | |
of: fdt: Remove weak early_init_dt_mark_hotplug_memory_arch()
Commit 41a9ada3e6b4253f ("of/fdt: mark hotpluggable memory") introduced
two (for systems with and without memblock) weak versions of
early_init_dt_mark_hotplug_memory_arch(), that could be overridden by an
architecture-specific version. However, no overrides ever emerged.
Later, commit aca52c3983891060 ("mm: remove CONFIG_HAVE_MEMBLOCK")
removed the non-memblock version.
Remove early_init_dt_mark_hotplug_memory_arch(), and replace it by a
direct call to memblock_mark_hotplug().
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/1a61f75ec50d3c2922fcdbe33337266a58a4125f.1628671960.git.geert+renesas@glider.be
Signed-off-by: Rob Herring <robh@kernel.org>
Diffstat (limited to 'drivers/of')
| -rw-r--r-- | drivers/of/fdt.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index e25b41591ab2..09ed7e597eee 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -1045,7 +1045,7 @@ int __init early_init_dt_scan_memory(unsigned long node, const char *uname, if (!hotpluggable) continue; - if (early_init_dt_mark_hotplug_memory_arch(base, size)) + if (memblock_mark_hotplug(base, size)) pr_warn("failed to mark hotplug range 0x%llx - 0x%llx\n", base, base + size); } @@ -1158,11 +1158,6 @@ void __init __weak early_init_dt_add_memory_arch(u64 base, u64 size) memblock_add(base, size); } -int __init __weak early_init_dt_mark_hotplug_memory_arch(u64 base, u64 size) -{ - return memblock_mark_hotplug(base, size); -} - static void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align) { void *ptr = memblock_alloc(size, align); |