x86/of: Remove unused early_init_dt_add_memory_arch()
PATCH 1/1 x86/of: Remove unused early_init_dt_add_memory_arch()
Recently the objtool starts complaining on the dead code in the object files, in particular
vmlinux.o: warning: objtool: early_init_dt_scan_memory+0x191: unreachable instruction
when CONFIG_OF=y.
Indeed, the entire early_init_dt_scan() is not used on x86 and making it compile (with help of CONFIG_OF) will abrupt the code flow since in the middle of it we have a BUG() instruction.
Remove the entire culprit function to make objtool happy.
--- arch/x86/kernel/devicetree.c | 5 ----- 1 file changed, 5 deletions(-)
arch/x86/kernel/devicetree.c +0 -5
@@ -31,11 +31,6 @@ char __initdata cmd_line[COMMAND_LINE_SIZE];int __initdata of_ioapic; -void __init early_init_dt_add_memory_arch (u64 base,u64 size) -{ -BUG (); -} -void __init add_dtb (u64 data) { initial_dtb = data + offsetof(struct setup_data , data);
Signature · 1 line
2.35.1
The following commit has been merged into the x86/apic branch of tip:
The following commit has been merged into the x86/apic branch of tip:
Commit-ID: 9b09927c0cdec4d4e75f7f9e621eaec179a888fd Gitweb: https://git.kernel.org/tip/9b09927c0cdec4d4e75f7f9e621eaec179a888fd Author: Andy Shevchenko <[email protected]> AuthorDate: Thu, 24 Nov 2022 20:48:24 +02:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Fri, 02 Dec 2022 14:57:13 +01:00
x86/of: Remove unused early_init_dt_add_memory_arch()
Recently objtool started complaining about dead code in the object files, in particular
vmlinux.o: warning: objtool: early_init_dt_scan_memory+0x191: unreachable instruction
when CONFIG_OF=y.
Indeed, early_init_dt_scan() is not used on x86 and making it compile (with help of CONFIG_OF) will abrupt the code flow since in the middle of it there is a BUG() instruction.
Remove the pointless function.
--- arch/x86/kernel/devicetree.c | 5 ----- 1 file changed, 5 deletions(-)
arch/x86/kernel/devicetree.c +0 -5
@@ -31,11 +31,6 @@ char __initdata cmd_line[COMMAND_LINE_SIZE];int __initdata of_ioapic; -void __init early_init_dt_add_memory_arch (u64 base,u64 size) -{ -BUG (); -} -void __init add_dtb (u64 data) { initial_dtb = data + offsetof(struct setup_data , data);