Index: kernel/test/synch/rwlock2.c
===================================================================
--- kernel/test/synch/rwlock2.c	(revision 70b6de17d76360ed8d3b167e184fa20dc135a760)
+++ kernel/test/synch/rwlock2.c	(revision f88fcbec8f4c20dfefb67f4a7237bfc980de7a2d)
@@ -40,7 +40,4 @@
 static rwlock_t rwlock;
 
-static void writer(void *arg);
-static void failed(void);
-
 static void writer(void *arg)
 {
@@ -59,16 +56,8 @@
 }
 
-static void failed()
-{
-	printf("Test failed prematurely.\n");
-	thread_exit();
-}
-
-void test_rwlock2(void)
+char * test_rwlock2(void)
 {
 	thread_t *thrd;
 	
-	printf("Read/write locks test #2\n");
-    
 	rwlock_initialize(&rwlock);
 
@@ -82,6 +71,5 @@
 		thread_ready(thrd);
 	else
-		failed();
-
+		return "Could not create thread";
 
 	thread_sleep(1);
@@ -90,5 +78,6 @@
 	rwlock_read_unlock(&rwlock);
 	rwlock_read_unlock(&rwlock);
-	rwlock_read_unlock(&rwlock);	
-
+	rwlock_read_unlock(&rwlock);
+	
+	return NULL;
 }