Commit 6f702428 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 

One more time/ntp fix pulled from Ingo Molnar.

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  ntp: Fix STA_INS/DEL clearing bug
parents c1e32096 6b1859db

kernel/time/ntp.c

+6 −2
Original line number Diff line number Diff line
@@ -409,7 +409,9 @@ int second_overflow(unsigned long secs) 
			time_state = TIME_DEL;

		break;

	case TIME_INS:

		if (secs % 86400 == 0) {

		if (!(time_status & STA_INS))

			time_state = TIME_OK;

		else if (secs % 86400 == 0) {

			leap = -1;

			time_state = TIME_OOP;

			time_tai++;
@@ -418,7 +420,9 @@ int second_overflow(unsigned long secs) 
		}

		break;

	case TIME_DEL:

		if ((secs + 1) % 86400 == 0) {

		if (!(time_status & STA_DEL))

			time_state = TIME_OK;

		else if ((secs + 1) % 86400 == 0) {

			leap = 1;

			time_tai--;

			time_state = TIME_WAIT;