svn commit: r324718 - stable/11/sys/kern

[Konstantin Belousov]

Author: kib
Date: Wed Oct 18 08:05:46 2017
New Revision: 324718
URL: https://svnweb.freebsd.org/changeset/base/324718

Log:
  MFC r324528:
  In tc_windup(), do not re-calculate bintime.

Modified:
  stable/11/sys/kern/kern_tc.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/kern/kern_tc.c
==============================================================================
--- stable/11/sys/kern/kern_tc.c	Wed Oct 18 07:39:21 2017	(r324717)
+++ stable/11/sys/kern/kern_tc.c	Wed Oct 18 08:05:46 2017	(r324718)
@@ -1417,10 +1417,8 @@ tc_windup(struct bintime *new_boottimebin)
 		if (bt.sec != t)
 			th->th_boottime.sec += bt.sec - t;
 	}
-	th->th_bintime = th->th_offset;
-	bintime_add(&th->th_bintime, &th->th_boottime);
 	/* Update the UTC timestamps used by the get*() functions. */
-	/* XXX shouldn't do this here.  Should force non-`get' versions. */
+	th->th_bintime = bt;
 	bintime2timeval(&bt, &th->th_microtime);
 	bintime2timespec(&bt, &th->th_nanotime);