Index: kernel/test/synch/rcu1.c
===================================================================
--- kernel/test/synch/rcu1.c	(revision a4fb8d60ffb2469744f8d1f6fad67fae13d69fcd)
+++ kernel/test/synch/rcu1.c	(revision 7f11dc6ba31c85d4b1daa9c4ebd4d6f99082a87c)
@@ -51,8 +51,6 @@
 } exited_t;
 
-/* Callback raced with preexisting readers. */
-#define ERACE   123
-/* Waited for too long for the callback to exit; consider it lost. */
-#define ECBLOST 432
+/* Co-opt EPARTY error code for race detection. */
+#define ERACE   EPARTY
 
 /*-------------------------------------------------------------------*/
@@ -71,5 +69,5 @@
 	
 	if (!p->exited) {
-		*presult = ECBLOST;
+		*presult = ETIMEOUT;
 	}
 }
Index: kernel/test/synch/semaphore2.c
===================================================================
--- kernel/test/synch/semaphore2.c	(revision a4fb8d60ffb2469744f8d1f6fad67fae13d69fcd)
+++ kernel/test/synch/semaphore2.c	(revision 7f11dc6ba31c85d4b1daa9c4ebd4d6f99082a87c)
@@ -60,5 +60,6 @@
 static void consumer(void *arg)
 {
-	int rc, to;
+	int rc;
+	int to;
 	
 	thread_detach(THREAD);