Merge tag 'trace-v6.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux...

[sfrench/cifs-2.6.git] / kernel / time / timer_migration.c

diff --git a/kernel/time/timer_migration.c b/kernel/time/timer_migration.c
index 8f49b6b96dfd097d3172fe4d35d0b1ba5dc933c5..611cd904f0357e08fffca607ba1de0b51a109479 100644 (file)
--- a/kernel/time/timer_migration.c
+++ b/kernel/time/timer_migration.c
@@ -751,26 +751,6 @@ bool tmigr_update_events(struct tmigr_group *group, struct tmigr_group *child,
 
                first_childevt = evt = data->evt;
 
-               /*
-                * Walking the hierarchy is required in any case when a
-                * remote expiry was done before. This ensures to not lose
-                * already queued events in non active groups (see section
-                * "Required event and timerqueue update after a remote
-                * expiry" in the documentation at the top).
-                *
-                * The two call sites which are executed without a remote expiry
-                * before, are not prevented from propagating changes through
-                * the hierarchy by the return:
-                *  - When entering this path by tmigr_new_timer(), @evt->ignore
-                *    is never set.
-                *  - tmigr_inactive_up() takes care of the propagation by
-                *    itself and ignores the return value. But an immediate
-                *    return is required because nothing has to be done in this
-                *    level as the event could be ignored.
-                */
-               if (evt->ignore && !remote)
-                       return true;
-
                raw_spin_lock(&group->lock);
 
                childstate.state = 0;