tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

authored by

Geert Uytterhoeven and committed by
Rob Herring 39c6b3a3 18250b43

+1 -7
+1 -6
drivers/of/fdt.c
··· 1045 1045 if (!hotpluggable) 1046 1046 continue; 1047 1047 1048 - if (early_init_dt_mark_hotplug_memory_arch(base, size)) 1048 + if (memblock_mark_hotplug(base, size)) 1049 1049 pr_warn("failed to mark hotplug range 0x%llx - 0x%llx\n", 1050 1050 base, base + size); 1051 1051 } ··· 1156 1156 base = phys_offset; 1157 1157 } 1158 1158 memblock_add(base, size); 1159 - } 1160 - 1161 - int __init __weak early_init_dt_mark_hotplug_memory_arch(u64 base, u64 size) 1162 - { 1163 - return memblock_mark_hotplug(base, size); 1164 1159 } 1165 1160 1166 1161 static void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align)
-1
include/linux/of_fdt.h
··· 67 67 extern void early_init_fdt_reserve_self(void); 68 68 extern void __init early_init_dt_scan_chosen_arch(unsigned long node); 69 69 extern void early_init_dt_add_memory_arch(u64 base, u64 size); 70 - extern int early_init_dt_mark_hotplug_memory_arch(u64 base, u64 size); 71 70 extern u64 dt_mem_next_cell(int s, const __be32 **cellp); 72 71 73 72 /* Early flat tree scan hooks */