From owner-svn-src-projects@FreeBSD.ORG Mon Nov 5 02:36:10 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DB8D0ADB; Mon, 5 Nov 2012 02:36:10 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id BF7018FC0A; Mon, 5 Nov 2012 02:36:10 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA52aAo2006991; Mon, 5 Nov 2012 02:36:10 GMT (envelope-from mav@svn.freebsd.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA52aAaO006989; Mon, 5 Nov 2012 02:36:10 GMT (envelope-from mav@svn.freebsd.org) Message-Id: <201211050236.qA52aAaO006989@svn.freebsd.org> From: Alexander Motin Date: Mon, 5 Nov 2012 02:36:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r242597 - projects/calloutng/sys/kern X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Nov 2012 02:36:11 -0000 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; /*