From owner-svn-src-stable@FreeBSD.ORG  Wed Oct 28 15:58:15 2009
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 ADE5E106568F;
	Wed, 28 Oct 2009 15:58:15 +0000 (UTC)
	(envelope-from emaste@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9C8418FC0A;
	Wed, 28 Oct 2009 15:58:15 +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 n9SFwF5A065849;
	Wed, 28 Oct 2009 15:58:15 GMT (envelope-from emaste@svn.freebsd.org)
Received: (from emaste@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n9SFwFQh065847;
	Wed, 28 Oct 2009 15:58:15 GMT (envelope-from emaste@svn.freebsd.org)
Message-Id: <200910281558.n9SFwFQh065847@svn.freebsd.org>
From: Ed Maste <emaste@FreeBSD.org>
Date: Wed, 28 Oct 2009 15:58:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r198548 - stable/6/sys/dev/aac
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, 28 Oct 2009 15:58:15 -0000

Author: emaste
Date: Wed Oct 28 15:58:15 2009
New Revision: 198548
URL: http://svn.freebsd.org/changeset/base/198548

Log:
  Replace callout_schedule (which doesn't exist on 6.x) with callout_reset.

Modified:
  stable/6/sys/dev/aac/aac.c

Modified: stable/6/sys/dev/aac/aac.c
==============================================================================
--- stable/6/sys/dev/aac/aac.c	Wed Oct 28 15:36:55 2009	(r198547)
+++ stable/6/sys/dev/aac/aac.c	Wed Oct 28 15:58:15 2009	(r198548)
@@ -378,7 +378,7 @@ aac_daemon(void *arg)
 	*(uint32_t *)fib->data = tv.tv_sec;
 	aac_sync_fib(sc, SendHostTime, 0, fib, sizeof(uint32_t));
 	aac_release_sync_fib(sc);
-	callout_schedule(&sc->aac_daemontime, 30 * 60 * hz);
+	callout_reset(&sc->aac_daemontime, 30 * 60 * hz, aac_daemon, sc);
 }
 
 void