Skip to content

Commit 901b329

Browse files
Darksonnojeda
authored andcommittedMar 9, 2025
rust: fix signature of rust_fmt_argument
Without this change, the rest of this series will emit the following error message: error[E0308]: `if` and `else` have incompatible types --> <linux>/rust/kernel/print.rs:22:22 | 21 | #[export] | --------- expected because of this 22 | unsafe extern "C" fn rust_fmt_argument( | ^^^^^^^^^^^^^^^^^ expected `u8`, found `i8` | = note: expected fn item `unsafe extern "C" fn(*mut u8, *mut u8, *mut c_void) -> *mut u8 {bindings::rust_fmt_argument}` found fn item `unsafe extern "C" fn(*mut i8, *mut i8, *const c_void) -> *mut i8 {print::rust_fmt_argument}` The error may be different depending on the architecture. To fix this, change the void pointer argument to use a const pointer, and change the imports to use crate::ffi instead of core::ffi for integer types. Fixes: 787983d ("vsprintf: add new `%pA` format specifier") Reviewed-by: Tamir Duberstein <tamird@gmail.com> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Alice Ryhl <aliceryhl@google.com> Acked-by: Petr Mladek <pmladek@suse.com> Link: https://lore.kernel.org/r/20250303-export-macro-v3-1-41fbad85a27f@google.com Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
1 parent 0e123d6 commit 901b329

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed
 

‎lib/vsprintf.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -2285,7 +2285,7 @@ int __init no_hash_pointers_enable(char *str)
22852285
early_param("no_hash_pointers", no_hash_pointers_enable);
22862286

22872287
/* Used for Rust formatting ('%pA'). */
2288-
char *rust_fmt_argument(char *buf, char *end, void *ptr);
2288+
char *rust_fmt_argument(char *buf, char *end, const void *ptr);
22892289

22902290
/*
22912291
* Show a '%p' thing. A kernel extension is that the '%p' is followed

‎rust/kernel/print.rs

+3-4
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@
66
//!
77
//! Reference: <https://docs.kernel.org/core-api/printk-basics.html>
88
9-
use core::{
9+
use crate::{
1010
ffi::{c_char, c_void},
11-
fmt,
11+
str::RawFormatter,
1212
};
13-
14-
use crate::str::RawFormatter;
13+
use core::fmt;
1514

1615
// Called from `vsprintf` with format specifier `%pA`.
1716
#[expect(clippy::missing_safety_doc)]

0 commit comments

Comments
 (0)
Please sign in to comment.