From 75b706fde4cbf82bcd41a1cec319778aa0f8eb2d Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Fri, 9 Dec 2016 14:19:03 +0100 Subject: Update to FreeBSD head 2016-12-10 Git mirror commit 80c55f08a05ab3b26a73b226ccb56adc3122a55c. --- freebsd/sys/kern/kern_timeout.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'freebsd/sys/kern/kern_timeout.c') diff --git a/freebsd/sys/kern/kern_timeout.c b/freebsd/sys/kern/kern_timeout.c index 37ec0956..73b55338 100644 --- a/freebsd/sys/kern/kern_timeout.c +++ b/freebsd/sys/kern/kern_timeout.c @@ -17,7 +17,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -1059,6 +1059,8 @@ callout_when(sbintime_t sbt, sbintime_t precision, int flags, spinlock_exit(); #endif #endif + if (cold && to_sbt == 0) + to_sbt = sbinuptime(); if ((flags & C_HARDCLOCK) == 0) to_sbt += tick_sbt; } else -- cgit v1.2.3