diff options
author | 2023-08-30 16:06:38 -0700 | |
---|---|---|
committer | 2023-08-30 16:06:38 -0700 | |
commit | 1ac731c529cd4d6adbce134754b51ff7d822b145 (patch) | |
tree | 143ab3f35ca5f3b69f583c84e6964b17139c2ec1 /rust/kernel/print.rs | |
parent | Input: goodix - add support for ACPI ID GDX9110 (diff) | |
parent | Input: rpckbd - fix the return value handle for platform_get_irq() (diff) | |
download | wireguard-linux-1ac731c529cd4d6adbce134754b51ff7d822b145.tar.xz wireguard-linux-1ac731c529cd4d6adbce134754b51ff7d822b145.zip |
Merge branch 'next' into for-linus
Prepare input updates for 6.6 merge window.
Diffstat (limited to 'rust/kernel/print.rs')
-rw-r--r-- | rust/kernel/print.rs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/rust/kernel/print.rs b/rust/kernel/print.rs index 30103325696d..8009184bf6d7 100644 --- a/rust/kernel/print.rs +++ b/rust/kernel/print.rs @@ -18,7 +18,11 @@ use crate::bindings; // Called from `vsprintf` with format specifier `%pA`. #[no_mangle] -unsafe fn rust_fmt_argument(buf: *mut c_char, end: *mut c_char, ptr: *const c_void) -> *mut c_char { +unsafe extern "C" fn rust_fmt_argument( + buf: *mut c_char, + end: *mut c_char, + ptr: *const c_void, +) -> *mut c_char { use fmt::Write; // SAFETY: The C contract guarantees that `buf` is valid if it's less than `end`. let mut w = unsafe { RawFormatter::from_ptrs(buf.cast(), end.cast()) }; |