diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-02-15 09:54:46 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-02-15 09:54:46 -0800 |
| commit | 243899076c3efdf98d8e922a802896424a597580 (patch) | |
| tree | 195f3dd0c38d605b666cf72b9c2292a9d9a704e0 /tools | |
| parent | d440148418f4816b4973ec6723bf63821793a0a7 (diff) | |
| parent | 2e4f982cf392af2f1282b5537a72144e064799e3 (diff) | |
| download | linux-243899076c3efdf98d8e922a802896424a597580.tar.gz linux-243899076c3efdf98d8e922a802896424a597580.tar.bz2 linux-243899076c3efdf98d8e922a802896424a597580.zip | |
Merge tag 'rust-fixes-6.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ojeda/linux
Pull rust fixes from Miguel Ojeda:
- Fix objtool warning due to future Rust 1.85.0 (to be released in a
few days)
- Clean future Rust 1.86.0 (to be released 2025-04-03) Clippy warning
* tag 'rust-fixes-6.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ojeda/linux:
rust: rbtree: fix overindented list item
objtool/rust: add one more `noreturn` Rust function
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/objtool/check.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/objtool/check.c b/tools/objtool/check.c index 753dbc4f8198..a027d1c0bb2b 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -227,6 +227,7 @@ static bool is_rust_noreturn(const struct symbol *func) str_ends_with(func->name, "_4core9panicking18panic_bounds_check") || str_ends_with(func->name, "_4core9panicking19assert_failed_inner") || str_ends_with(func->name, "_4core9panicking36panic_misaligned_pointer_dereference") || + strstr(func->name, "_4core9panicking13assert_failed") || strstr(func->name, "_4core9panicking11panic_const24panic_const_") || (strstr(func->name, "_4core5slice5index24slice_") && str_ends_with(func->name, "_fail")); |