Index: kernel/generic/src/synch/condvar.c
===================================================================
--- kernel/generic/src/synch/condvar.c	(revision 205832be3aac366938f4e110d02825acf0142693)
+++ kernel/generic/src/synch/condvar.c	(revision 4f5e1c7c92f197446ceb7d6406c1f5233ad02527)
@@ -120,5 +120,5 @@
  * @return See comment for waitq_sleep_timeout().
  */
-int _condvar_wait_timeout_spinlock(condvar_t *cv, spinlock_t *lock, 
+int _condvar_wait_timeout_spinlock_impl(condvar_t *cv, spinlock_t *lock, 
 	uint32_t usec, int flags)
 {
Index: kernel/generic/src/synch/rcu.c
===================================================================
--- kernel/generic/src/synch/rcu.c	(revision 205832be3aac366938f4e110d02825acf0142693)
+++ kernel/generic/src/synch/rcu.c	(revision 4f5e1c7c92f197446ceb7d6406c1f5233ad02527)
@@ -861,6 +861,6 @@
 			
 			/* Wait for the GP to complete. */
-			int ret = _condvar_wait_timeout_spinlock(&rcu.gp_ended, 
-				&rcu.gp_lock, SYNCH_NO_TIMEOUT, SYNCH_FLAGS_INTERRUPTIBLE);
+			int ret = _condvar_wait_timeout_spinlock(&rcu.gp_ended, &rcu.gp_lock, 
+				SYNCH_NO_TIMEOUT, SYNCH_FLAGS_INTERRUPTIBLE);
 			
 			if (ret == ESYNCH_INTERRUPTED) {