Index: src/Makefile.config
===================================================================
--- src/Makefile.config	(revision 7b7d7d1cbbddea9be6f0e75c0adabf7bda19ad53)
+++ src/Makefile.config	(revision 34b20f5d489985b2fc7632ad2bc10d24bc936c27)
@@ -12,10 +12,10 @@
 
 # Deadlock detection support for spinlocks.
-#DEBUG_SPINLOCK=DEBUG_SPINLOCK
+DEBUG_SPINLOCK=DEBUG_SPINLOCK
 
 # Uncomment if you want to run in the test mode
-#TEST=__TEST__
+TEST=__TEST__
 
-#TEST_FILE=test.c
+TEST_FILE=test.c
 
 # Select what test do you want to run
Index: test/synch/rwlock1/test.c
===================================================================
--- test/synch/rwlock1/test.c	(revision 7b7d7d1cbbddea9be6f0e75c0adabf7bda19ad53)
+++ test/synch/rwlock1/test.c	(revision 34b20f5d489985b2fc7632ad2bc10d24bc936c27)
@@ -29,5 +29,5 @@
 #include <test.h>
 #include <arch.h>
-#include <arch/atomic.h>
+#include <arch/smp/atomic.h>
 #include <print.h>
 #include <proc/thread.h>
Index: test/synch/rwlock2/test.c
===================================================================
--- test/synch/rwlock2/test.c	(revision 7b7d7d1cbbddea9be6f0e75c0adabf7bda19ad53)
+++ test/synch/rwlock2/test.c	(revision 34b20f5d489985b2fc7632ad2bc10d24bc936c27)
@@ -29,5 +29,5 @@
 #include <test.h>
 #include <arch.h>
-#include <arch/atomic.h>
+#include <arch/smp/atomic.h>
 #include <print.h>
 #include <proc/thread.h>
Index: test/synch/rwlock3/test.c
===================================================================
--- test/synch/rwlock3/test.c	(revision 7b7d7d1cbbddea9be6f0e75c0adabf7bda19ad53)
+++ test/synch/rwlock3/test.c	(revision 34b20f5d489985b2fc7632ad2bc10d24bc936c27)
@@ -29,5 +29,5 @@
 #include <test.h>
 #include <arch.h>
-#include <arch/atomic.h>
+#include <arch/smp/atomic.h>
 #include <print.h>
 #include <proc/thread.h>
Index: test/synch/rwlock4/test.c
===================================================================
--- test/synch/rwlock4/test.c	(revision 7b7d7d1cbbddea9be6f0e75c0adabf7bda19ad53)
+++ test/synch/rwlock4/test.c	(revision 34b20f5d489985b2fc7632ad2bc10d24bc936c27)
@@ -29,5 +29,5 @@
 #include <test.h>
 #include <arch.h>
-#include <arch/atomic.h>
+#include <arch/smp/atomic.h>
 #include <print.h>
 #include <proc/thread.h>
Index: test/synch/rwlock5/test.c
===================================================================
--- test/synch/rwlock5/test.c	(revision 7b7d7d1cbbddea9be6f0e75c0adabf7bda19ad53)
+++ test/synch/rwlock5/test.c	(revision 34b20f5d489985b2fc7632ad2bc10d24bc936c27)
@@ -29,5 +29,5 @@
 #include <test.h>
 #include <arch.h>
-#include <arch/atomic.h>
+#include <arch/smp/atomic.h>
 #include <print.h>
 #include <proc/thread.h>
Index: test/synch/semaphore1/test.c
===================================================================
--- test/synch/semaphore1/test.c	(revision 7b7d7d1cbbddea9be6f0e75c0adabf7bda19ad53)
+++ test/synch/semaphore1/test.c	(revision 34b20f5d489985b2fc7632ad2bc10d24bc936c27)
@@ -29,5 +29,5 @@
 #include <test.h>
 #include <arch.h>
-#include <arch/atomic.h>
+#include <arch/smp/atomic.h>
 #include <print.h>
 #include <proc/thread.h>
Index: test/synch/semaphore2/test.c
===================================================================
--- test/synch/semaphore2/test.c	(revision 7b7d7d1cbbddea9be6f0e75c0adabf7bda19ad53)
+++ test/synch/semaphore2/test.c	(revision 34b20f5d489985b2fc7632ad2bc10d24bc936c27)
@@ -29,5 +29,5 @@
 #include <test.h>
 #include <arch.h>
-#include <arch/atomic.h>
+#include <arch/smp/atomic.h>
 #include <print.h>
 #include <proc/thread.h>