diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2025-07-09 11:51:34 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2025-07-09 11:51:34 +0200 |
commit | 068f7b64bf2054e20bbbd0782aa11f6ff8d17105 (patch) | |
tree | f9f88dfe79f4be4789480dc22f74908b3484a8f8 /rust/kernel/time/hrtimer.rs | |
parent | 8959338617a85e35820e3a7fa21801cf55b068bf (diff) | |
parent | e04c78d86a9699d136910cfc0bdcf01087e3267e (diff) |
Merge v6.16-rc2 into timers/ptp
to pick up the __GENMASK() fix, otherwise the AUX clock VDSO patches fail
to compile for compat.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'rust/kernel/time/hrtimer.rs')
-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) } } } } |