diff options
| author | Ingo Molnar <[email protected]> | 2023-06-28 11:16:03 +0200 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2023-06-29 17:27:47 -0700 |
| commit | 06697ca69bcaa76046be14684f513a89d2c7a240 (patch) | |
| tree | 78f8cbde9b5d1eae3318bb441cac50779fcd6bcd /lib/test_fortify/read_overflow2-memcmp.c | |
| parent | 632f54b4d60bfe0701f43d0bc387928de6e3dcfb (diff) | |
objtool: Remove btrfs_assertfail() from the noreturn exceptions list
The objtool merge in commit 6f612579be9d ("Merge tag 'objtool-core ...")
generated a semantic conflict that was not resolved.
The btrfs_assertfail() entry was removed from the noreturn list in
commit b831306b3b7d ("btrfs: print assertion failure report and stack
trace from the same line") because btrfs_assertfail() was changed from a
noreturn function into a macro.
The noreturn list was then moved from check.c to noreturns.h in commit
6245ce4ab670 ("objtool: Move noreturn function list to separate file"),
and should be removed from that post-merge as well.
Do it explicitly.
Cc: David Sterba <[email protected]>
Cc: Josh Poimboeuf <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: [email protected]
Signed-off-by: Ingo Molnar <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Diffstat (limited to 'lib/test_fortify/read_overflow2-memcmp.c')
0 files changed, 0 insertions, 0 deletions