diff options
author | 2025-06-14 08:38:34 -0700 | |
---|---|---|
committer | 2025-06-14 08:38:34 -0700 | |
commit | 588adb24b757d5d9a438056ac0347d8b3ac38dde (patch) | |
tree | b85dd72e80397a578ea68698ca06f62c28817f57 | |
parent | Merge tag 'mm-hotfixes-stable-2025-06-13-21-56' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm (diff) | |
parent | rust: time: Fix compile error in impl_has_hr_timer macro (diff) | |
download | wireguard-linux-588adb24b757d5d9a438056ac0347d8b3ac38dde.tar.xz wireguard-linux-588adb24b757d5d9a438056ac0347d8b3ac38dde.zip |
Merge tag 'rust-fixes-6.16' of git://git.kernel.org/pub/scm/linux/kernel/git/ojeda/linux
Pull Rust fix from Miguel Ojeda:
- 'hrtimer': fix future compile error when the 'impl_has_hr_timer!'
macro starts to get called
* tag 'rust-fixes-6.16' of git://git.kernel.org/pub/scm/linux/kernel/git/ojeda/linux:
rust: time: Fix compile error in impl_has_hr_timer macro
-rw-r--r-- | rust/kernel/time/hrtimer.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rust/kernel/time/hrtimer.rs b/rust/kernel/time/hrtimer.rs index 9df3dcd2fa39..36e1290cd079 100644 --- a/rust/kernel/time/hrtimer.rs +++ b/rust/kernel/time/hrtimer.rs @@ -517,7 +517,7 @@ macro_rules! impl_has_hr_timer { ) -> *mut Self { // SAFETY: As per the safety requirement of this function, `ptr` // is pointing inside a `$timer_type`. - unsafe { ::kernel::container_of!(ptr, $timer_type, $field).cast_mut() } + unsafe { ::kernel::container_of!(ptr, $timer_type, $field) } } } } |