diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-18 10:36:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-18 10:36:02 -0700 |
| commit | 6f7024285864290259d6b4c36f9e84a4b89ec3c4 (patch) | |
| tree | 6d6c429ae933289a993030609e2c2bb3627fda4f | |
| parent | c1e3209623ccd92f2f391a31ecf3895daa0238f3 (diff) | |
| parent | 6b1859dba01c7d512b72d77e3fd7da8354235189 (diff) | |
| download | blackbird-op-linux-6f7024285864290259d6b4c36f9e84a4b89ec3c4.tar.gz blackbird-op-linux-6f7024285864290259d6b4c36f9e84a4b89ec3c4.zip | |
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
| -rw-r--r-- | kernel/time/ntp.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c index 70b33abcc7bb..b7fbadc5c973 100644 --- a/kernel/time/ntp.c +++ b/kernel/time/ntp.c @@ -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; |
