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

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

Merge "hrtimer: make sure PINNED flag is cleared after removing hrtimer"

parents 02634498 29136c88

kernel/time/hrtimer.c

+2 −1
Original line number Diff line number Diff line
@@ -916,6 +916,7 @@ remove_hrtimer(struct hrtimer *timer, struct hrtimer_clock_base *base, bool rest 
			state = HRTIMER_STATE_INACTIVE;



		__remove_hrtimer(timer, base, state, reprogram);

		timer->state &= ~HRTIMER_STATE_PINNED;

		return 1;

	}

	return 0;
@@ -969,7 +970,7 @@ void hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim, 


	/* Update pinned state */

	timer->state &= ~HRTIMER_STATE_PINNED;

	timer->state |= !!(mode & HRTIMER_MODE_PINNED) << HRTIMER_PINNED_SHIFT;

	timer->state |= (!!(mode & HRTIMER_MODE_PINNED)) << HRTIMER_PINNED_SHIFT;



	leftmost = enqueue_hrtimer(timer, new_base);

	if (!leftmost)