[PATCH -next] rust_binder: use `LocalModule` for `THIS_MODULE`
Gary Guo <[email protected]>
| Newsgroups | org.kernel.vger.rust-for-linux,org.kernel.vger.linux-kernel,org.kernel.vger.linux-next |
|---|---|
| Message-ID | <[email protected]> |
From: Gary Guo <[email protected]> Replace the `THIS_MODULE` static reference in the binder netlink code with `this_module::<LocalModule>()`, consistent with the move of `THIS_MODULE` into the `ModuleMetadata` trait. Cc: Alvin Sun <[email protected]> Signed-off-by: Gary Guo <[email protected]> --- This is to resolve the semantic conflict between rust-next and char-misc-next. --- drivers/android/binder/netlink.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/android/binder/netlink.rs b/drivers/android/binder/netlink.rs index beb7ea2edaff..f34e1009432c 100644 --- a/drivers/android/binder/netlink.rs +++ b/drivers/android/binder/netlink.rs @@ -13,7 +13,7 @@ }; pub static BINDER_NL_FAMILY: Family = Family::const_new( - &crate::THIS_MODULE, + kernel::module::this_module::<crate::LocalModule>(), kernel::uapi::BINDER_FAMILY_NAME, kernel::uapi::BINDER_FAMILY_VERSION, &BINDER_NL_FAMILY_MCGRPS, base-commit: 2697ef8943c9985c14708a6429e21812693857b2 -- 2.54.0