svn commit: r208301 - stable/7/sys/kern

[Andriy Gapon]

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