diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2025-02-08 12:22:21 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-02-08 12:22:21 -0800 |
| commit | 595ab66f1becea80c4182b2d2660f357c17db2a9 (patch) | |
| tree | 5b9fe685f5b6676f8a2e076abc7fd8be4c45af3a /rust/kernel | |
| parent | Merge tag 'ftrace-v6.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace (diff) | |
| parent | x86: rust: set rustc-abi=x86-softfloat on rustc>=1.86.0 (diff) | |
| download | wireguard-linux-595ab66f1becea80c4182b2d2660f357c17db2a9.tar.xz wireguard-linux-595ab66f1becea80c4182b2d2660f357c17db2a9.zip | |
Merge tag 'rust-fixes-6.14' of https://github.com/Rust-for-Linux/linux
Pull rust fixes from Miguel Ojeda:
- Do not export KASAN ODR symbols to avoid gendwarfksyms warnings
- Fix future Rust 1.86.0 (to be released 2025-04-03) x86_64 builds
- Clean future Rust 1.86.0 (to be released 2025-04-03) warning
- Fix future GCC 15 (to be released in a few months) builds
- Fix `rusttest` target in macOS
* tag 'rust-fixes-6.14' of https://github.com/Rust-for-Linux/linux:
x86: rust: set rustc-abi=x86-softfloat on rustc>=1.86.0
rust: kbuild: do not export generated KASAN ODR symbols
rust: kbuild: add -fzero-init-padding-bits to bindgen_skip_cflags
rust: init: use explicit ABI to clean warning in future compilers
rust: kbuild: use host dylib naming in rusttestlib-kernel
Diffstat (limited to 'rust/kernel')
| -rw-r--r-- | rust/kernel/init.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rust/kernel/init.rs b/rust/kernel/init.rs index 3f9236c1c9d5..7fd1ea8265a5 100644 --- a/rust/kernel/init.rs +++ b/rust/kernel/init.rs @@ -870,7 +870,7 @@ pub unsafe trait PinInit<T: ?Sized, E = Infallible>: Sized { /// use kernel::{types::Opaque, init::pin_init_from_closure}; /// #[repr(C)] /// struct RawFoo([u8; 16]); - /// extern { + /// extern "C" { /// fn init_foo(_: *mut RawFoo); /// } /// |