From owner-svn-src-projects@FreeBSD.ORG  Thu Dec 13 23:05:46 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
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 F07AC9B0;
 Thu, 13 Dec 2012 23:05:45 +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 CED568FC13;
 Thu, 13 Dec 2012 23:05:45 +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 qBDN5jB5032746;
 Thu, 13 Dec 2012 23:05:45 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBDN5j9m032745;
 Thu, 13 Dec 2012 23:05:45 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201212132305.qBDN5j9m032745@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Thu, 13 Dec 2012 23:05:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244196 - 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 &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Dec 2012 23:05:46 -0000

Author: mav
Date: Thu Dec 13 23:05:45 2012
New Revision: 244196
URL: http://svnweb.freebsd.org/changeset/base/244196

Log:
  Use correct precision for legacy callouts. Zero flags mean precision of
  half tick, not a full interval.

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

Modified: projects/calloutng/sys/kern/kern_timeout.c
==============================================================================
--- projects/calloutng/sys/kern/kern_timeout.c	Thu Dec 13 23:03:37 2012	(r244195)
+++ projects/calloutng/sys/kern/kern_timeout.c	Thu Dec 13 23:05:45 2012	(r244196)
@@ -938,11 +938,15 @@ _callout_reset_on(struct callout *c, str
 		if (to_ticks > 1)
 			bintime_mul(&to_bt, to_ticks);
 		bintime_add(&to_bt, &now);
-		to_ticks >>= C_PRELGET(flags);
-		if (to_ticks == 0)
+		if (C_PRELGET(flags) == 0) {
 			pr = halftick_bt;
-		else
-			bintime_mul(&pr, to_ticks);
+		} else {
+			to_ticks >>= C_PRELGET(flags);
+			if (to_ticks == 0)
+				pr = halftick_bt;
+			else
+				bintime_mul(&pr, to_ticks);
+		}
 	} else { 
 		to_bt = *bt;
 		if (precision != NULL)