From owner-svn-src-projects@FreeBSD.ORG  Wed Feb  6 15:55:42 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 7D0D13FF;
 Wed,  6 Feb 2013 15:55:42 +0000 (UTC)
 (envelope-from davide@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 5A5653FA;
 Wed,  6 Feb 2013 15:55:42 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r16FtgVr068763;
 Wed, 6 Feb 2013 15:55:42 GMT (envelope-from davide@svn.freebsd.org)
Received: (from davide@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r16FtgVl068762;
 Wed, 6 Feb 2013 15:55:42 GMT (envelope-from davide@svn.freebsd.org)
Message-Id: <201302061555.r16FtgVl068762@svn.freebsd.org>
From: Davide Italiano <davide@FreeBSD.org>
Date: Wed, 6 Feb 2013 15:55:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r246414 - 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: Wed, 06 Feb 2013 15:55:42 -0000

Author: davide
Date: Wed Feb  6 15:55:41 2013
New Revision: 246414
URL: http://svnweb.freebsd.org/changeset/base/246414

Log:
  Don't ask callout to align with hardclock() calls when there's no need.
  
  Reported by:	mav

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

Modified: projects/calloutng/sys/kern/kern_resource.c
==============================================================================
--- projects/calloutng/sys/kern/kern_resource.c	Wed Feb  6 15:23:55 2013	(r246413)
+++ projects/calloutng/sys/kern/kern_resource.c	Wed Feb  6 15:55:41 2013	(r246414)
@@ -646,7 +646,7 @@ lim_cb(void *arg)
 	}
 	if ((p->p_flag & P_WEXIT) == 0)
 		callout_reset_sbt(&p->p_limco, SBT_1S, 0,
-		    lim_cb, p, C_PREL(1) | C_HARDCLOCK);
+		    lim_cb, p, C_PREL(1));
 }
 
 int
@@ -699,7 +699,7 @@ kern_proc_setrlimit(struct thread *td, s
 		if (limp->rlim_cur != RLIM_INFINITY &&
 		    p->p_cpulimit == RLIM_INFINITY)
 			callout_reset_sbt(&p->p_limco, SBT_1S, 0,
-			    lim_cb, p, C_PREL(1) | C_HARDCLOCK);
+			    lim_cb, p, C_PREL(1));
 		p->p_cpulimit = limp->rlim_cur;
 		break;
 	case RLIMIT_DATA: