summaryrefslogtreecommitdiff
path: root/rust
diff options
context:
space:
mode:
authorDavid Gow <davidgow@google.com>2023-02-15 01:47:35 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-04-26 15:28:38 +0300
commit55fba69fbfd04cfa81ecbdb8c56e6b9f02123cd2 (patch)
tree1e3a24e94381a2a2974372efbdc803e8cd5fe8f8 /rust
parente19ebc5f9a711fb97835068660fd0bc43aad0f92 (diff)
downloadlinux-55fba69fbfd04cfa81ecbdb8c56e6b9f02123cd2.tar.xz
rust: kernel: Mark rust_fmt_argument as extern "C"
commit c682e4c37d2b8ba3bde1125cbbea4ee88824b4e2 upstream. The rust_fmt_argument function is called from printk() to handle the %pA format specifier. Since it's called from C, we should mark it extern "C" to make sure it's ABI compatible. Cc: stable@vger.kernel.org Fixes: 247b365dc8dc ("rust: add `kernel` crate") Signed-off-by: David Gow <davidgow@google.com> Reviewed-by: Gary Guo <gary@garyguo.net> Reviewed-by: Björn Roy Baron <bjorn3_gh@protonmail.com> Reviewed-by: Vincenzo Palazzo <vincenzopalazzodev@gmail.com> [Applied `rustfmt`] Signed-off-by: Miguel Ojeda <ojeda@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'rust')
-rw-r--r--rust/kernel/print.rs6
1 files changed, 5 insertions, 1 deletions
diff --git a/rust/kernel/print.rs b/rust/kernel/print.rs
index 97ff086ba22e..b6d1c12136de 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()) };