svn commit: r242597 - projects/calloutng/sys/kern

[Alexander Motin]

Author: mav
Date: Mon Nov  5 02:36:10 2012
New Revision: 242597
URL: http://svnweb.freebsd.org/changeset/base/242597

Log:
  Restore rounding of non-positive time values for legacy callouts to 1 tick.

Modified:
  projects/calloutng/sys/kern/kern_timeout.c

Modified: projects/calloutng/sys/kern/kern_timeout.c
==============================================================================
--- projects/calloutng/sys/kern/kern_timeout.c	Mon Nov  5 02:34:52 2012	(r242596)
+++ projects/calloutng/sys/kern/kern_timeout.c	Mon Nov  5 02:36:10 2012	(r242597)
@@ -948,10 +948,11 @@ _callout_reset_on(struct callout *c, str
 
 	cancelled = 0;
 	if (bt == NULL) {
-		FREQ2BT(hz,&to_bt);
+		FREQ2BT(hz, &to_bt);
 		getbinuptime(&now);
-		bintime_mul(&to_bt,to_ticks);
-		bintime_add(&to_bt,&now);
+		if (to_ticks > 0)
+			bintime_mul(&to_bt, to_ticks);
+		bintime_add(&to_bt, &now);
 	} else 
 		to_bt = *bt;
 	/*