Commit 39c6b3a3 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Rob Herring
Browse files

of: fdt: Remove weak early_init_dt_mark_hotplug_memory_arch() 



Commit 41a9ada3 ("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 aca52c39 ("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: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/1a61f75ec50d3c2922fcdbe33337266a58a4125f.1628671960.git.geert+renesas@glider.be


Signed-off-by: default avatarRob Herring <robh@kernel.org>
parent 18250b43

drivers/of/fdt.c

+1 −6
Original line number Diff line number Diff line
@@ -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);

include/linux/of_fdt.h

+0 −1
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ extern void early_init_fdt_scan_reserved_mem(void); 
extern void early_init_fdt_reserve_self(void);

extern void __init early_init_dt_scan_chosen_arch(unsigned long node);

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 u64 dt_mem_next_cell(int s, const __be32 **cellp);



/* Early flat tree scan hooks */