socsvn commit: r240315 - in soc2012/gmiller/locking-head: . lib/libthr/thread

[gmiller at FreeBSD.org]

Author: gmiller
Date: Mon Aug 13 04:08:25 2012
New Revision: 240315
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240315

Log:
   r240361 at FreeBSD-dev:  root | 2012-08-11 12:41:04 -0500
   Fix an error in the merge.

Modified:
  soc2012/gmiller/locking-head/   (props changed)
  soc2012/gmiller/locking-head/lib/libthr/thread/thr_private.h

Modified: soc2012/gmiller/locking-head/lib/libthr/thread/thr_private.h
==============================================================================
--- soc2012/gmiller/locking-head/lib/libthr/thread/thr_private.h	Mon Aug 13 03:48:24 2012	(r240314)
+++ soc2012/gmiller/locking-head/lib/libthr/thread/thr_private.h	Mon Aug 13 04:08:25 2012	(r240315)
@@ -743,8 +743,8 @@
 int	_mutex_cv_lock(struct pthread_mutex *, int _PROFILE_PARMS) __hidden;
 int	_mutex_cv_unlock(struct pthread_mutex *, int *, int * _PROFILE_PARMS)
 	    __hidden;
-int     _mutex_cv_attach(struct pthread_mutex *, int _PROFILE_PARMS) __hidden;
-int     _mutex_cv_detach(struct pthread_mutex *, int * _PROFILE_PARMS) __hidden;
+int     _mutex_cv_attach(struct pthread_mutex *, int) __hidden;
+int     _mutex_cv_detach(struct pthread_mutex *, int *) __hidden;
 int     _mutex_owned(struct pthread *, const struct pthread_mutex *) __hidden;
 int	_mutex_reinit(pthread_mutex_t *) __hidden;
 void	_mutex_fork(struct pthread *curthread) __hidden;