diff options
| author | Geert Uytterhoeven <geert+renesas@glider.be> | 2021-08-11 10:52:28 +0200 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2021-08-15 09:56:03 -0500 |
| commit | 18250b43f7b6d0085724bf6fc186f9a107066068 (patch) | |
| tree | 928152c83bb89070df361cdcbd93522e0aab36de /drivers | |
| parent | 6b2117ad65f1bca9ece6d4b1ee784b42701a2d86 (diff) | |
of: fdt: Remove early_init_dt_reserve_memory_arch() override capability
Commit e7ae8d174eec0b3b ("MIPS: replace add_memory_region with
memblock") removed the last architecture-specific override of
early_init_dt_reserve_memory_arch().
Convert the common implementation from a weak global function to a
static function.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/be0140a0183ecfd0a3afa4fe6d2d77ed418102f9.1628671897.git.geert+renesas@glider.be
Signed-off-by: Rob Herring <robh@kernel.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/of/fdt.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index 5dc0b0310d7c..e25b41591ab2 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -475,6 +475,22 @@ void *initial_boot_params __ro_after_init; static u32 of_fdt_crc32; +static int __init early_init_dt_reserve_memory_arch(phys_addr_t base, + phys_addr_t size, bool nomap) +{ + if (nomap) { + /* + * If the memory is already reserved (by another region), we + * should not allow it to be marked nomap. + */ + if (memblock_is_region_reserved(base, size)) + return -EBUSY; + + return memblock_mark_nomap(base, size); + } + return memblock_reserve(base, size); +} + /* * __reserved_mem_reserve_reg() - reserve all memory described in 'reg' property */ @@ -1147,22 +1163,6 @@ int __init __weak early_init_dt_mark_hotplug_memory_arch(u64 base, u64 size) return memblock_mark_hotplug(base, size); } -int __init __weak early_init_dt_reserve_memory_arch(phys_addr_t base, - phys_addr_t size, bool nomap) -{ - if (nomap) { - /* - * If the memory is already reserved (by another region), we - * should not allow it to be marked nomap. - */ - if (memblock_is_region_reserved(base, size)) - return -EBUSY; - - return memblock_mark_nomap(base, size); - } - return memblock_reserve(base, size); -} - static void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align) { void *ptr = memblock_alloc(size, align); |