The branch stable/12 has been updated by gbe (doc committer): URL: https://cgit.FreeBSD.org/src/commit/?id=6a3ad2d0a7b633bad2bb33f9c4c426dffcc91633
commit 6a3ad2d0a7b633bad2bb33f9c4c426dffcc91633 Author: Jan Kokemüller <[email protected]> AuthorDate: 2021-01-09 19:00:25 +0000 Commit: Gordon Bergling <[email protected]> CommitDate: 2021-01-30 10:11:55 +0000 kevent(2): Bugfix for wrong EVFILT_TIMER timeouts When using NOTE_NSECONDS in the kevent(2) API, US_TO_SBT should be used instead of NS_TO_SBT, otherwise the timeout results are misleading. PR: 252539 Reviewed by: kevans, kib Approved by: kevans Differential Revision: https://reviews.freebsd.org/D28067 (cherry picked from commit 4d0c33be634a929f323117f04e6b1670776f9e37) --- sys/kern/kern_event.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c index 2a0852eae0ce..af611281ee68 100644 --- a/sys/kern/kern_event.c +++ b/sys/kern/kern_event.c @@ -665,7 +665,7 @@ timer2sbintime(int64_t data, int flags) if (secs > (SBT_MAX / SBT_1S)) return (SBT_MAX); #endif - return (secs << 32 | US_TO_SBT(data % 1000000000)); + return (secs << 32 | NS_TO_SBT(data % 1000000000)); } return (NS_TO_SBT(data)); default: _______________________________________________ [email protected] mailing list https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all To unsubscribe, send any mail to "[email protected]"
