diff options
| author | Ingo Molnar <mingo@kernel.org> | 2026-08-20 09:00:19 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2026-08-20 09:00:20 +0200 |
| commit | 0f67fd0e16ce63e3d4f705e344f252cda32077ea (patch) | |
| tree | 97921534beb0c9a82533469818b99c3b1188c904 /kernel | |
| parent | a4ff2be345d0abc943da8dd8da98151843b750dc (diff) | |
| parent | c793bbfc4a0a9f5a66978fc91559e9681748dbeb (diff) | |
| download | linux-next-0f67fd0e16ce63e3d4f705e344f252cda32077ea.tar.gz linux-next-0f67fd0e16ce63e3d4f705e344f252cda32077ea.zip | |
Merge branch into tip/master: 'core/urgent'
# New commits in core/urgent:
c793bbfc4a0a ("timer: Keep debugobjects state consistent in migrate_timer_list()")
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/time/timer.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/time/timer.c b/kernel/time/timer.c index 655a8c6cd84d..ae9abf14688e 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -2492,6 +2492,7 @@ static void migrate_timer_list(struct timer_base *new_base, struct hlist_head *h timer = hlist_entry(head->first, struct timer_list, entry); detach_timer(timer, false); timer->flags = (timer->flags & ~TIMER_BASEMASK) | cpu; + debug_timer_activate(timer); internal_add_timer(new_base, timer); } } |