]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
hrtimer: Fix softirq base check in update_needs_ipi()
authorThomas Weißschuh <thomas.weissschuh@linutronix.de>
Wed, 7 Jan 2026 10:39:24 +0000 (11:39 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 23 Jan 2026 10:21:28 +0000 (11:21 +0100)
commit 05dc4a9fc8b36d4c99d76bbc02aa9ec0132de4c2 upstream.

The 'clockid' field is not the correct way to check for a softirq base.

Fix the check to correctly compare the base type instead of the clockid.

Fixes: 1e7f7fbcd40c ("hrtimer: Avoid more SMP function calls in clock_was_set()")
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@kernel.org>
Cc: stable@vger.kernel.org
Link: https://patch.msgid.link/20260107-hrtimer-clock-base-check-v1-1-afb5dbce94a1@linutronix.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
kernel/time/hrtimer.c

index 88aa062b8a556db071dad74d34ba5953c3e57339..e618addb58641c223d941366749cb15d2c9a2d6e 100644 (file)
@@ -913,7 +913,7 @@ static bool update_needs_ipi(struct hrtimer_cpu_base *cpu_base,
                        return true;
 
                /* Extra check for softirq clock bases */
-               if (base->clockid < HRTIMER_BASE_MONOTONIC_SOFT)
+               if (base->index < HRTIMER_BASE_MONOTONIC_SOFT)
                        continue;
                if (cpu_base->softirq_activated)
                        continue;