From owner-svn-src-projects@FreeBSD.ORG  Fri Aug 10 02:54:35 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D322B106566C;
	Fri, 10 Aug 2012 02:54:35 +0000 (UTC)
	(envelope-from davide@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BDC8D8FC08;
	Fri, 10 Aug 2012 02:54:35 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7A2sZBx083491;
	Fri, 10 Aug 2012 02:54:35 GMT (envelope-from davide@svn.freebsd.org)
Received: (from davide@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7A2sZEY083489;
	Fri, 10 Aug 2012 02:54:35 GMT (envelope-from davide@svn.freebsd.org)
Message-Id: <201208100254.q7A2sZEY083489@svn.freebsd.org>
From: Davide Italiano <davide@FreeBSD.org>
Date: Fri, 10 Aug 2012 02:54:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r239165 - projects/calloutng/sys/kern
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Fri, 10 Aug 2012 02:54:35 -0000

Author: davide
Date: Fri Aug 10 02:54:35 2012
New Revision: 239165
URL: http://svn.freebsd.org/changeset/base/239165

Log:
  In callout_cc_add(), r_val is sum up with the fractional part of struct
  bintime, so it needs to be uint64_t rather than int. Make this change.
  
  Discussed with:		mav

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

Modified: projects/calloutng/sys/kern/kern_timeout.c
==============================================================================
--- projects/calloutng/sys/kern/kern_timeout.c	Fri Aug 10 01:34:22 2012	(r239164)
+++ projects/calloutng/sys/kern/kern_timeout.c	Fri Aug 10 02:54:35 2012	(r239165)
@@ -558,7 +558,8 @@ callout_cc_add(struct callout *c, struct
     int flags)
 {
 	struct bintime bt;
-	int bucket, r_shift, r_val;	
+	uint64_t r_val;
+	int bucket, r_shift;	
 	
 	CC_LOCK_ASSERT(cc);
 	if (bintime_cmp(&to_bintime, &cc->cc_lastscan, <))