The following commit has been merged into the objtool/core branch of tip: Commit-ID: ff9a6459bbec06df7da2545020d7383aba13b3fb Gitweb: https://git.kernel.org/tip/ff9a6459bbec06df7da2545020d7383aba13b3fb Author: Josh Poimboeuf <jpoimboe@xxxxxxxxxx> AuthorDate: Fri, 02 Jun 2023 10:54:53 -07:00 Committer: Peter Zijlstra <peterz@xxxxxxxxxxxxx> CommitterDate: Fri, 02 Jun 2023 21:12:24 +02:00 objtool: Add __kunit_abort() to noreturns Fixes a bunch of warnings like: drivers/input/tests/input_test.o: warning: objtool: input_test_init+0x1cb: stack state mismatch: cfa1=4+64 cfa2=4+56 lib/kunit/kunit-test.o: warning: objtool: kunit_log_newline_test+0xfb: return with modified stack frame ... Fixes: 260755184cbd ("kunit: Move kunit_abort() call out of kunit_do_failed_assertion()") Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Signed-off-by: Josh Poimboeuf <jpoimboe@xxxxxxxxxx> Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx> Link: https://lkml.kernel.org/r/20230602175453.swsn3ehyochtwkhy@treble --- tools/objtool/noreturns.h | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/objtool/noreturns.h b/tools/objtool/noreturns.h index cede606..1514e84 100644 --- a/tools/objtool/noreturns.h +++ b/tools/objtool/noreturns.h @@ -7,6 +7,7 @@ * Yes, this is unfortunate. A better solution is in the works. */ NORETURN(__invalid_creds) +NORETURN(__kunit_abort) NORETURN(__module_put_and_kthread_exit) NORETURN(__reiserfs_panic) NORETURN(__stack_chk_fail)
![]() |