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

Commit 5b16a221 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'sched/clock' into sched/urgent

parents b922df73 5b7dba4f

kernel/sched_clock.c

+3 −3
Original line number Diff line number Diff line
@@ -119,12 +119,12 @@ static u64 __update_sched_clock(struct sched_clock_data *scd, u64 now) 
	/*

	 * scd->clock = clamp(scd->tick_gtod + delta,

	 *		      max(scd->tick_gtod, scd->clock),

	 * 		      scd->tick_gtod + TICK_NSEC);

	 *		      max(scd->clock, scd->tick_gtod + TICK_NSEC));

	 */



	clock = scd->tick_gtod + delta;

	min_clock = wrap_max(scd->tick_gtod, scd->clock);

	max_clock = scd->tick_gtod + TICK_NSEC;

	max_clock = wrap_max(scd->clock, scd->tick_gtod + TICK_NSEC);



	clock = wrap_max(clock, min_clock);

	clock = wrap_min(clock, max_clock);