Index: kernel/test/synch/rwlock5.c
===================================================================
--- kernel/test/synch/rwlock5.c	(revision 98000fb4ea6015506f059c9b121e417ce991ecfd)
+++ kernel/test/synch/rwlock5.c	(revision 61001a9defa8a06128475b5d909949241e85057e)
@@ -70,5 +70,6 @@
 {
 	int i, j, k;
-	long readers, writers;
+	atomic_count_t readers;
+	atomic_count_t writers;
 	
 	waitq_initialize(&can_start);
Index: kernel/test/synch/semaphore1.c
===================================================================
--- kernel/test/synch/semaphore1.c	(revision 98000fb4ea6015506f059c9b121e417ce991ecfd)
+++ kernel/test/synch/semaphore1.c	(revision 61001a9defa8a06128475b5d909949241e85057e)
@@ -73,5 +73,6 @@
 {
 	int i, j, k;
-	int consumers, producers;
+	atomic_count_t consumers;
+	atomic_count_t producers;
 	
 	waitq_initialize(&can_start);