Messages in this thread Patch in this message | | | Date | Tue, 19 Apr 2022 20:08:42 -0000 | From | "tip-bot2 for Peter Zijlstra" <> | Subject | [tip: x86/urgent] x86,objtool: Mark cpu_startup_entry() __noreturn |
| |
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: d4e5268a08b211b536fed29beb24271ecd85187e Gitweb: https://git.kernel.org/tip/d4e5268a08b211b536fed29beb24271ecd85187e Author: Peter Zijlstra <peterz@infradead.org> AuthorDate: Fri, 08 Apr 2022 11:45:55 +02:00 Committer: Peter Zijlstra <peterz@infradead.org> CommitterDate: Tue, 19 Apr 2022 21:58:48 +02:00
x86,objtool: Mark cpu_startup_entry() __noreturn
GCC-8 isn't clever enough to figure out that cpu_start_entry() is a noreturn while objtool is. This results in code after the call in start_secondary(). Give GCC a hand so that they all agree on things.
vmlinux.o: warning: objtool: start_secondary()+0x10e: unreachable
Reported-by: Rick Edgecombe <rick.p.edgecombe@intel.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Acked-by: Josh Poimboeuf <jpoimboe@redhat.com> Link: https://lore.kernel.org/r/20220408094718.383658532@infradead.org --- include/linux/cpu.h | 2 +- tools/objtool/check.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/include/linux/cpu.h b/include/linux/cpu.h index 9cf51e4..54dc2f9 100644 --- a/include/linux/cpu.h +++ b/include/linux/cpu.h @@ -167,7 +167,7 @@ static inline int suspend_disable_secondary_cpus(void) { return 0; } static inline void suspend_enable_secondary_cpus(void) { } #endif /* !CONFIG_PM_SLEEP_SMP */ -void cpu_startup_entry(enum cpuhp_state state); +void __noreturn cpu_startup_entry(enum cpuhp_state state); void cpu_idle_poll_ctrl(bool enable); diff --git a/tools/objtool/check.c b/tools/objtool/check.c index bd0c2c8..e3a675d 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -184,6 +184,7 @@ static bool __dead_end_function(struct objtool_file *file, struct symbol *func, "do_group_exit", "stop_this_cpu", "__invalid_creds", + "cpu_startup_entry", }; if (!func)
| |