We have new THIS_MODULE. ThisModule is now crate. This is ugly for reason that drivers should not use as_ptr() directly. Currently binder still needs it so ugly cast is totally ok.
Signed-off-by: Kari Argillander <[email protected]> --- drivers/android/binder/rust_binder_main.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/android/binder/rust_binder_main.rs b/drivers/android/binder/rust_binder_main.rs index d84c3c360be0..fc921c0e1116 100644 --- a/drivers/android/binder/rust_binder_main.rs +++ b/drivers/android/binder/rust_binder_main.rs @@ -21,6 +21,7 @@ sync::poll::PollTable, sync::Arc, task::Pid, + this_module::ThisModule, transmute::AsBytes, types::ForeignOwnable, uaccess::UserSliceWriter, @@ -319,7 +320,7 @@ unsafe impl<T> Sync for AssertSync<T> {} let zeroed_ops = unsafe { core::mem::MaybeUninit::zeroed().assume_init() }; let ops = kernel::bindings::file_operations { - owner: THIS_MODULE.as_ptr(), + owner: <THIS_MODULE as ThisModule>::OWNER.as_ptr(), poll: Some(rust_binder_poll), unlocked_ioctl: Some(rust_binder_ioctl), #[cfg(CONFIG_COMPAT)] -- 2.43.0
