From owner-svn-src-stable-9@FreeBSD.ORG  Fri Mar 23 16:12:53 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3A152106564A;
	Fri, 23 Mar 2012 16:12:53 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 24FF58FC12;
	Fri, 23 Mar 2012 16:12:53 +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 q2NGCqCX083518;
	Fri, 23 Mar 2012 16:12:52 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2NGCqat083516;
	Fri, 23 Mar 2012 16:12:52 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201203231612.q2NGCqat083516@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Fri, 23 Mar 2012 16:12:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r233367 - stable/9/sys/kern
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Mar 2012 16:12:53 -0000

Author: mav
Date: Fri Mar 23 16:12:52 2012
New Revision: 233367
URL: http://svn.freebsd.org/changeset/base/233367

Log:
  MFC r232717:
  Be more polite when setting state->nextevent inside cpu_new_callout().
  Hardclock is not the only who wakes idle CPU since kdtrace cyclic addition.

Modified:
  stable/9/sys/kern/kern_clocksource.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/kern/kern_clocksource.c
==============================================================================
--- stable/9/sys/kern/kern_clocksource.c	Fri Mar 23 15:49:46 2012	(r233366)
+++ stable/9/sys/kern/kern_clocksource.c	Fri Mar 23 16:12:52 2012	(r233367)
@@ -860,10 +860,11 @@ cpu_new_callout(int cpu, int ticks)
 	 * If timer is global - there is chance it is already programmed.
 	 */
 	if (periodic || (timer->et_flags & ET_FLAGS_PERCPU) == 0) {
-		state->nextevent = state->nexthard;
 		tmp = hardperiod;
 		bintime_mul(&tmp, ticks - 1);
-		bintime_add(&state->nextevent, &tmp);
+		bintime_add(&tmp, &state->nexthard);
+		if (bintime_cmp(&tmp, &state->nextevent, <))
+			state->nextevent = tmp;
 		if (periodic ||
 		    bintime_cmp(&state->nextevent, &nexttick, >=)) {
 			ET_HW_UNLOCK(state);