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

Commit 1344cf5f authored by Viresh Kumar's avatar Viresh Kumar Committed by Satya Durga Srinivasu Prabhala
Browse files

hrtimer: make sure PINNED flag is cleared after removing hrtimer 



Change-Id: I1a3211bc0d5d310c7fa7b92dc44ec6c4722dd7b9
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
[forward port to 3.18]
Signed-off-by: default avatarSantosh Shukla <santosh.shukla@linaro.org>
Git-commit: d6c894e515b4cd93c3a08e7c60cce0aa5118c656
Git-repo: git://git.linaro.org/people/mike.holmes/santosh.shukla/lng-isol.git


Signed-off-by: default avatarOlav Haugan <ohaugan@codeaurora.org>
Signed-off-by: default avatarSatya Durga Srinivasu Prabhala <satyap@codeaurora.org>
parent e4bb211a

kernel/time/hrtimer.c

+2 −1
Original line number Diff line number Diff line
@@ -1026,6 +1026,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;
@@ -1093,7 +1094,7 @@ static int __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;



	return enqueue_hrtimer(timer, new_base, mode);

}