Skip to content

Commit 588adb2

Browse files
committed
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
2 parents 27b9989 + 5b2d595 commit 588adb2

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

rust/kernel/time/hrtimer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ macro_rules! impl_has_hr_timer {
517517
) -> *mut Self {
518518
// SAFETY: As per the safety requirement of this function, `ptr`
519519
// is pointing inside a `$timer_type`.
520-
unsafe { ::kernel::container_of!(ptr, $timer_type, $field).cast_mut() }
520+
unsafe { ::kernel::container_of!(ptr, $timer_type, $field) }
521521
}
522522
}
523523
}

0 commit comments

Comments
 (0)