Commit 588adb24 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 27b9989b 5b2d595e

rust/kernel/time/hrtimer.rs

+1 −1
Original line number Diff line number Diff line
@@ -517,7 +517,7 @@ unsafe fn timer_container_of( 
            ) -> *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) }

            }

        }

    }