Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 08c44d00 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "hrtimer.h: prevent pinned timer state from breaking inactive test"

parents f48e4744 fa31ee4b
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -1152,8 +1152,8 @@ bool hrtimer_active(const struct hrtimer *timer)
		cpu_base = READ_ONCE(timer->base->cpu_base);
		seq = raw_read_seqcount_begin(&cpu_base->seq);

		if (timer->state != HRTIMER_STATE_INACTIVE ||
		    cpu_base->running == timer)
		if (((timer->state & ~HRTIMER_STATE_PINNED) !=
		      HRTIMER_STATE_INACTIVE) || cpu_base->running == timer)
			return true;

	} while (read_seqcount_retry(&cpu_base->seq, seq) ||