tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 6f702428 c1e32096

+6 -2
+6 -2
kernel/time/ntp.c
··· 409 409 time_state = TIME_DEL; 410 410 break; 411 411 case TIME_INS: 412 - if (secs % 86400 == 0) { 412 + if (!(time_status & STA_INS)) 413 + time_state = TIME_OK; 414 + else if (secs % 86400 == 0) { 413 415 leap = -1; 414 416 time_state = TIME_OOP; 415 417 time_tai++; ··· 420 418 } 421 419 break; 422 420 case TIME_DEL: 423 - if ((secs + 1) % 86400 == 0) { 421 + if (!(time_status & STA_DEL)) 422 + time_state = TIME_OK; 423 + else if ((secs + 1) % 86400 == 0) { 424 424 leap = 1; 425 425 time_tai--; 426 426 time_state = TIME_WAIT;