From owner-svn-src-stable@FreeBSD.ORG  Wed May 19 15:50:17 2010
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9FF751065676;
	Wed, 19 May 2010 15:50:17 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8E3E08FC21;
	Wed, 19 May 2010 15:50:17 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o4JFoH8d017494;
	Wed, 19 May 2010 15:50:17 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4JFoHU4017492;
	Wed, 19 May 2010 15:50:17 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201005191550.o4JFoHU4017492@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Wed, 19 May 2010 15:50:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r208301 - stable/7/sys/kern
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 19 May 2010 15:50:17 -0000

Author: avg
Date: Wed May 19 15:50:17 2010
New Revision: 208301
URL: http://svn.freebsd.org/changeset/base/208301

Log:
  kern_ntptime: fix two problems with r208298 (MFC of r207360)
  
  This is a direct commit to fix previous improperly done MFC.
  - sys/clock.h include is needed for resettodr()
  - there is no callout_schedule in 7, so callout_reset has to be used

Modified:
  stable/7/sys/kern/kern_ntptime.c

Modified: stable/7/sys/kern/kern_ntptime.c
==============================================================================
--- stable/7/sys/kern/kern_ntptime.c	Wed May 19 15:06:09 2010	(r208300)
+++ stable/7/sys/kern/kern_ntptime.c	Wed May 19 15:50:17 2010	(r208301)
@@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sysproto.h>
+#include <sys/clock.h>
 #include <sys/eventhandler.h>
 #include <sys/kernel.h>
 #include <sys/priv.h>
@@ -986,7 +987,8 @@ periodic_resettodr(void *arg __unused)
 		mtx_unlock(&Giant);
 	}
 	if (resettodr_period > 0)
-		callout_schedule(&resettodr_callout, resettodr_period * hz);
+		callout_reset(&resettodr_callout, resettodr_period * hz,
+		    periodic_resettodr, NULL);
 }
 
 static void