From owner-svn-src-projects@FreeBSD.ORG  Sat Nov  3 01:40:06 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 52A90DCA;
 Sat,  3 Nov 2012 01:40:06 +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 3B1288FC12;
 Sat,  3 Nov 2012 01:40:06 +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 qA31e6VC048889;
 Sat, 3 Nov 2012 01:40:06 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id qA31e65J048886;
 Sat, 3 Nov 2012 01:40:06 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201211030140.qA31e65J048886@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Sat, 3 Nov 2012 01:40:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r242505 - in projects/calloutng/sys: kern sys
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: Sat, 03 Nov 2012 01:40:06 -0000

Author: mav
Date: Sat Nov  3 01:40:05 2012
New Revision: 242505
URL: http://svn.freebsd.org/changeset/base/242505

Log:
  Fix the build.

Modified:
  projects/calloutng/sys/kern/kern_timeout.c
  projects/calloutng/sys/sys/rwlock.h

Modified: projects/calloutng/sys/kern/kern_timeout.c
==============================================================================
--- projects/calloutng/sys/kern/kern_timeout.c	Sat Nov  3 01:17:41 2012	(r242504)
+++ projects/calloutng/sys/kern/kern_timeout.c	Sat Nov  3 01:40:05 2012	(r242505)
@@ -128,9 +128,8 @@ struct cc_exec {
  * state for the callout processing thread on the individual CPU.
  */
 struct callout_cpu {
-	struct cc_exec 		cc_exec_entity[2];
 	struct mtx_padalign	cc_lock;
-	struct cc_mig_ent	cc_migrating_entity;
+	struct cc_exec 		cc_exec_entity[2];
 	struct callout		*cc_callout;
 	struct callout_tailq	*cc_callwheel;
 	struct callout_tailq	cc_expireq;

Modified: projects/calloutng/sys/sys/rwlock.h
==============================================================================
--- projects/calloutng/sys/sys/rwlock.h	Sat Nov  3 01:17:41 2012	(r242504)
+++ projects/calloutng/sys/sys/rwlock.h	Sat Nov  3 01:40:05 2012	(r242505)
@@ -173,7 +173,7 @@ void	_rw_assert(const struct rwlock *rw,
 		rw_runlock(rw);						\
 } while (0)
 #define	rw_sleep(chan, rw, pri, wmesg, timo)				\
-	_sleep((chan), &(rw)->lock_object, (pri), (wmesg), (timo))
+	_sleep((chan), &(rw)->lock_object, (pri), (wmesg), (timo), NULL, 0)
 
 #define	rw_initialized(rw)	lock_initalized(&(rw)->lock_object)