Skip to content

Commit

Permalink
hrtimer: Add missing ACCESS_PRIVATE() for hrtimer::function
Browse files Browse the repository at this point in the history
The "function" field of struct hrtimer has been changed to private, but
two instances have not been converted to use ACCESS_PRIVATE().

Convert them to use ACCESS_PRIVATE().

Fixes: 04257da ("hrtimers: Make callback function pointer private")
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Nam Cao <namcao@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/all/20250408103854.1851093-1-namcao@linutronix.de
Closes: https://lore.kernel.org/oe-kbuild-all/202504071931.vOVl13tt-lkp@intel.com/
Closes: https://lore.kernel.org/oe-kbuild-all/202504072155.5UAZjYGU-lkp@intel.com/
  • Loading branch information
Nam Cao authored and Thomas Gleixner committed Apr 9, 2025
1 parent 0af2f6b commit 2424e14
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion include/linux/hrtimer.h
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ static inline void hrtimer_update_function(struct hrtimer *timer,
if (WARN_ON_ONCE(!function))
return;
#endif
timer->function = function;
ACCESS_PRIVATE(timer, function) = function;
}

/* Forward a hrtimer so it expires after now: */
Expand Down
2 changes: 1 addition & 1 deletion kernel/time/hrtimer.c
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ static const struct debug_obj_descr hrtimer_debug_descr;

static void *hrtimer_debug_hint(void *addr)
{
return ((struct hrtimer *) addr)->function;
return ACCESS_PRIVATE((struct hrtimer *)addr, function);
}

/*
Expand Down

0 comments on commit 2424e14

Please sign in to comment.