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

[Alexander Motin]

Author: mav
Date: Tue Nov  6 17:11:28 2012
New Revision: 242663
URL: http://svnweb.freebsd.org/changeset/base/242663

Log:
  Change cv_timedwait_bt_sig() to cv_timedwait_sig_bt() to make it more
  unified with cv_timedwait_sig_flags().

Modified:
  projects/calloutng/sys/kern/sys_generic.c
  projects/calloutng/sys/sys/condvar.h

Modified: projects/calloutng/sys/kern/sys_generic.c
==============================================================================
--- projects/calloutng/sys/kern/sys_generic.c	Tue Nov  6 16:51:41 2012	(r242662)
+++ projects/calloutng/sys/kern/sys_generic.c	Tue Nov  6 17:11:28 2012	(r242663)
@@ -1666,7 +1666,7 @@ seltdwait(struct thread *td, struct bint
 	if (bt == NULL && timo > 0) 
 		error = cv_timedwait_sig(&stp->st_wait, &stp->st_mtx, timo);
 	else if (bt != NULL)
-		error = cv_timedwait_bt_sig(&stp->st_wait, &stp->st_mtx,
+		error = cv_timedwait_sig_bt(&stp->st_wait, &stp->st_mtx,
 		    bt, 0);
 	else	
 		error = cv_wait_sig(&stp->st_wait, &stp->st_mtx);

Modified: projects/calloutng/sys/sys/condvar.h
==============================================================================
--- projects/calloutng/sys/sys/condvar.h	Tue Nov  6 16:51:41 2012	(r242662)
+++ projects/calloutng/sys/sys/condvar.h	Tue Nov  6 17:11:28 2012	(r242663)
@@ -73,7 +73,7 @@ void	cv_broadcastpri(struct cv *cvp, int
 	_cv_timedwait((cvp), &(lock)->lock_object, NULL, (timo), 0)	
 #define	cv_timedwait_bt(cvp, lock, bt, flags)				\
 	_cv_timedwait_sig((cvp), &(lock)->lock_object, (bt), 0, 0)
-#define	cv_timedwait_bt_sig(cvp, lock, bt, flags)			\
+#define	cv_timedwait_sig_bt(cvp, lock, bt, flags)			\
 	_cv_timedwait_sig((cvp), &(lock)->lock_object, (bt), 0, 	\
 	    (flags))
 #define	cv_timedwait_flags(cvp, lock, timo, flags)			\