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

Commit b1e25f41 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull leap second timer fix from Thomas Gleixner.

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  timekeeping: Fix CLOCK_MONOTONIC inconsistency during leapsecond
parents 857505fa fad0c66c

kernel/time/timekeeping.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -962,6 +962,7 @@ static cycle_t logarithmic_accumulation(cycle_t offset, int shift) 
		timekeeper.xtime.tv_sec++;

		timekeeper.xtime.tv_sec++;

		leap = second_overflow(timekeeper.xtime.tv_sec);

		leap = second_overflow(timekeeper.xtime.tv_sec);

		timekeeper.xtime.tv_sec += leap;

		timekeeper.xtime.tv_sec += leap;

		timekeeper.wall_to_monotonic.tv_sec -= leap;

	}

	}





	/* Accumulate raw time */

	/* Accumulate raw time */
@@ -1077,6 +1078,7 @@ static void update_wall_time(void) 
		timekeeper.xtime.tv_sec++;

		timekeeper.xtime.tv_sec++;

		leap = second_overflow(timekeeper.xtime.tv_sec);

		leap = second_overflow(timekeeper.xtime.tv_sec);

		timekeeper.xtime.tv_sec += leap;

		timekeeper.xtime.tv_sec += leap;

		timekeeper.wall_to_monotonic.tv_sec -= leap;

	}

	}





	timekeeping_update(false);

	timekeeping_update(false);