From owner-svn-src-projects@FreeBSD.ORG  Sat Dec 22 13:44:36 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 8F03B9AF;
 Sat, 22 Dec 2012 13:44:36 +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 7420D8FC0A;
 Sat, 22 Dec 2012 13:44:36 +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 qBMDia4u087057;
 Sat, 22 Dec 2012 13:44:36 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBMDia09087056;
 Sat, 22 Dec 2012 13:44:36 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201212221344.qBMDia09087056@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Sat, 22 Dec 2012 13:44:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r244586 - 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: Sat, 22 Dec 2012 13:44:36 -0000

Author: mav
Date: Sat Dec 22 13:44:35 2012
New Revision: 244586
URL: http://svnweb.freebsd.org/changeset/base/244586

Log:
  If sync to the hardclock requested, limit minimal period to one tick.

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

Modified: projects/calloutng/sys/kern/kern_timeout.c
==============================================================================
--- projects/calloutng/sys/kern/kern_timeout.c	Sat Dec 22 13:43:12 2012	(r244585)
+++ projects/calloutng/sys/kern/kern_timeout.c	Sat Dec 22 13:44:35 2012	(r244586)
@@ -907,6 +907,8 @@ callout_reset_bt_on(struct callout *c, s
 	if (flags & C_ABSOLUTE) {
 		to_bt = bt;
 	} else {
+		if ((flags & C_HARDCLOCK) && bintime_cmp(&bt, &tick_bt, <))
+			bt = tick_bt;
 		if ((flags & C_HARDCLOCK) ||
 #ifdef NO_EVENTTIMERS
 		    bintime_cmp(&bt, &bt_timethreshold, >=)) {