Index: kernel/generic/src/smp/smp_call.c
===================================================================
--- kernel/generic/src/smp/smp_call.c	(revision c8fccf5b75e9757a8b5d17f388f8c4e32b8d1a07)
+++ kernel/generic/src/smp/smp_call.c	(revision fc89e32010e50e34041343fec03821fd9d0b07df)
@@ -131,5 +131,5 @@
 		/*
 		 * If a platform supports SMP it must implement arch_smp_call_ipi().
-		 * It should issue an IPI an cpu_id and invoke smp_call_ipi_recv()
+		 * It should issue an IPI on cpu_id and invoke smp_call_ipi_recv()
 		 * on cpu_id in turn. 
 		 * 
Index: kernel/generic/src/synch/condvar.c
===================================================================
--- kernel/generic/src/synch/condvar.c	(revision c8fccf5b75e9757a8b5d17f388f8c4e32b8d1a07)
+++ kernel/generic/src/synch/condvar.c	(revision fc89e32010e50e34041343fec03821fd9d0b07df)
@@ -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 c8fccf5b75e9757a8b5d17f388f8c4e32b8d1a07)
+++ kernel/generic/src/synch/rcu.c	(revision fc89e32010e50e34041343fec03821fd9d0b07df)
@@ -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) {