svn commit: r242505 - in projects/calloutng/sys: kern sys

[Alexander Motin]

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)