diff options
| author | Alexei Starovoitov <ast@kernel.org> | 2025-06-26 09:48:06 -0700 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2025-06-26 09:49:39 -0700 |
| commit | 886178a33a30fe685e926d84f531243982fb3c70 (patch) | |
| tree | 23d0020f98ba1015593795ca957c55e5a306bd68 /drivers/rtc/dev.c | |
| parent | 5046acc11382565c4a46818a5bc43bb65d20ed31 (diff) | |
| parent | e34a79b96ab9d49ed8b605fee11099cf3efbb428 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf after rc3
Cross-merge BPF, perf and other fixes after downstream PRs.
It restores BPF CI to green after critical fix
commit bc4394e5e79c ("perf: Fix the throttle error of some clock events")
No conflicts.
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'drivers/rtc/dev.c')
| -rw-r--r-- | drivers/rtc/dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/dev.c b/drivers/rtc/dev.c index 0eeae5bcc3aa..baf1a8ca8b2b 100644 --- a/drivers/rtc/dev.c +++ b/drivers/rtc/dev.c @@ -72,7 +72,7 @@ static void rtc_uie_task(struct work_struct *work) static void rtc_uie_timer(struct timer_list *t) { - struct rtc_device *rtc = from_timer(rtc, t, uie_timer); + struct rtc_device *rtc = timer_container_of(rtc, t, uie_timer); unsigned long flags; spin_lock_irqsave(&rtc->irq_lock, flags); |