Index: arch/amd64/include/atomic.h
===================================================================
--- arch/amd64/include/atomic.h	(revision 45fb65c09103dff87bfb6916993a019f9309b363)
+++ arch/amd64/include/atomic.h	(revision 23684b75fbd877e18cebd073cdb4a435652e8c2c)
@@ -33,16 +33,5 @@
 #include <arch/barrier.h>
 #include <preemption.h>
-
-typedef struct { volatile __u64 count; } atomic_t;
-
-static inline void atomic_set(atomic_t *val, __u64 i)
-{
-	val->count = i;
-}
-
-static inline __u64 atomic_get(atomic_t *val)
-{
-	return val->count;
-}
+#include <typedefs.h>
 
 static inline void atomic_inc(atomic_t *val) {
@@ -62,7 +51,7 @@
 }
 
-static inline count_t atomic_postinc(atomic_t *val) 
+static inline long atomic_postinc(atomic_t *val) 
 {
-	count_t r;
+	long r;
 
 	__asm__ volatile (
@@ -75,7 +64,7 @@
 }
 
-static inline count_t atomic_postdec(atomic_t *val) 
+static inline long atomic_postdec(atomic_t *val) 
 {
-	count_t r;
+	long r;
 	
 	__asm__ volatile (
@@ -104,5 +93,5 @@
 
 
-/** AMD64 specific fast spinlock */
+/** amd64 specific fast spinlock */
 static inline void atomic_lock_arch(atomic_t *val)
 {
@@ -117,5 +106,5 @@
 		"mov %0, %1;"
 		"testq %1, %1;"
-		"jnz 0b;"       /* Leightweight looping on locked spinlock */
+		"jnz 0b;"       /* Lightweight looping on locked spinlock */
 		
 		"incq %1;"      /* now use the atomic operation */
Index: arch/amd64/src/proc/scheduler.c
===================================================================
--- arch/amd64/src/proc/scheduler.c	(revision 45fb65c09103dff87bfb6916993a019f9309b363)
+++ arch/amd64/src/proc/scheduler.c	(revision 23684b75fbd877e18cebd073cdb4a435652e8c2c)
@@ -34,6 +34,6 @@
 #include <arch/asm.h>
 #include <arch/debugger.h>
+#include <print.h>
 
-#include <print.h>
 void before_thread_runs_arch(void)
 {
Index: arch/ia32/include/atomic.h
===================================================================
--- arch/ia32/include/atomic.h	(revision 45fb65c09103dff87bfb6916993a019f9309b363)
+++ arch/ia32/include/atomic.h	(revision 23684b75fbd877e18cebd073cdb4a435652e8c2c)
@@ -33,16 +33,5 @@
 #include <arch/barrier.h>
 #include <preemption.h>
-
-typedef struct { volatile __u32 count; } atomic_t;
-
-static inline void atomic_set(atomic_t *val, __u32 i)
-{
-	val->count = i;
-}
-
-static inline __u32 atomic_get(atomic_t *val)
-{
-	return val->count;
-}
+#include <typedefs.h>
 
 static inline void atomic_inc(atomic_t *val) {
@@ -62,7 +51,7 @@
 }
 
-static inline count_t atomic_postinc(atomic_t *val) 
+static inline long atomic_postinc(atomic_t *val) 
 {
-	count_t r;
+	long r;
 
 	__asm__ volatile (
@@ -75,7 +64,7 @@
 }
 
-static inline count_t atomic_postdec(atomic_t *val) 
+static inline long atomic_postdec(atomic_t *val) 
 {
-	count_t r;
+	long r;
 	
 	__asm__ volatile (
@@ -103,5 +92,5 @@
 }
 
-/** Ia32 specific fast spinlock */
+/** ia32 specific fast spinlock */
 static inline void atomic_lock_arch(atomic_t *val)
 {
@@ -116,5 +105,5 @@
 		"mov %0, %1;"
 		"testl %1, %1;"
-		"jnz 0b;"       /* Leightweight looping on locked spinlock */
+		"jnz 0b;"       /* Lightweight looping on locked spinlock */
 		
 		"incl %1;"      /* now use the atomic operation */
Index: arch/ia32/src/userspace.c
===================================================================
--- arch/ia32/src/userspace.c	(revision 45fb65c09103dff87bfb6916993a019f9309b363)
+++ arch/ia32/src/userspace.c	(revision 23684b75fbd877e18cebd073cdb4a435652e8c2c)
@@ -62,5 +62,5 @@
 		"pushl %4\n"
 		"movl %5, %%eax\n"
-		"iret"
+		"iret\n"
 		: 
 		: "i" (selector(UDATA_DES) | PL_USER), "r" (kernel_uarg->uspace_stack+THREAD_STACK_SIZE),
Index: arch/ia64/include/atomic.h
===================================================================
--- arch/ia64/include/atomic.h	(revision 45fb65c09103dff87bfb6916993a019f9309b363)
+++ arch/ia64/include/atomic.h	(revision 23684b75fbd877e18cebd073cdb4a435652e8c2c)
@@ -31,6 +31,6 @@
 
 #include <arch/types.h>
+#include <typedefs.h>
 
-typedef struct { volatile __u64 count; } atomic_t;
 
 /** Atomic addition.
@@ -41,7 +41,7 @@
  * @return Value before addition.
  */
-static inline count_t atomic_add(atomic_t *val, int imm)
+static inline long atomic_add(atomic_t *val, int imm)
 {
-	count_t v;
+	long v;
 
  	__asm__ volatile ("fetchadd8.rel %0 = %1, %2\n" : "=r" (v), "+m" (val->count) : "i" (imm));
@@ -50,22 +50,12 @@
 }
 
-static inline void atomic_set(atomic_t *val, __u64 i)
-{
-	val->count = i;
-}
-
-static inline __u32 atomic_get(atomic_t *val)
-{
-	return val->count;
-}
-
 static inline void atomic_inc(atomic_t *val) { atomic_add(val, 1); }
 static inline void atomic_dec(atomic_t *val) { atomic_add(val, -1); }
 
-static inline count_t atomic_preinc(atomic_t *val) { return atomic_add(val, 1) + 1; }
-static inline count_t atomic_predec(atomic_t *val) { return atomic_add(val, -1) - 1; }
+static inline long atomic_preinc(atomic_t *val) { return atomic_add(val, 1) + 1; }
+static inline long atomic_predec(atomic_t *val) { return atomic_add(val, -1) - 1; }
 
-static inline count_t atomic_postinc(atomic_t *val) { return atomic_add(val, 1); }
-static inline count_t atomic_postdec(atomic_t *val) { return atomic_add(val, -1); }
+static inline long atomic_postinc(atomic_t *val) { return atomic_add(val, 1); }
+static inline long atomic_postdec(atomic_t *val) { return atomic_add(val, -1); }
 
 #endif
Index: arch/ia64/src/mm/tlb.c
===================================================================
--- arch/ia64/src/mm/tlb.c	(revision 45fb65c09103dff87bfb6916993a019f9309b363)
+++ arch/ia64/src/mm/tlb.c	(revision 23684b75fbd877e18cebd073cdb4a435652e8c2c)
@@ -439,5 +439,5 @@
 		page_table_unlock(AS, true);
 		if (!as_page_fault(va)) {
-			panic("%s: va=%P, rid=%d\n", __FUNCTION__, istate->cr_ifa, rr.map.rid);
+			panic("%s: va=%P, rid=%d, iip=%P\n", __FUNCTION__, istate->cr_ifa, rr.map.rid, istate->cr_iip);
 		}
 	}
Index: arch/mips32/include/atomic.h
===================================================================
--- arch/mips32/include/atomic.h	(revision 45fb65c09103dff87bfb6916993a019f9309b363)
+++ arch/mips32/include/atomic.h	(revision 23684b75fbd877e18cebd073cdb4a435652e8c2c)
@@ -31,4 +31,5 @@
 
 #include <arch/types.h>
+#include <typedefs.h>
 
 #define atomic_inc(x)	((void) atomic_add(x, 1))
@@ -41,6 +42,4 @@
 #define atomic_predec(x) atomic_add(x, -1)
 
-typedef struct { volatile __u32 count; } atomic_t;
-
 /* Atomic addition of immediate value.
  *
@@ -50,7 +49,7 @@
  * @return Value after addition.
  */
-static inline count_t atomic_add(atomic_t *val, int i)
+static inline long atomic_add(atomic_t *val, int i)
 {
-	count_t tmp, v;
+	long tmp, v;
 
 	__asm__ volatile (
@@ -69,15 +68,3 @@
 }
 
-/* Reads/writes are atomic on mips for 4-bytes */
-
-static inline void atomic_set(atomic_t *val, __u32 i)
-{
-	val->count = i;
-}
-
-static inline __u32 atomic_get(atomic_t *val)
-{
-	return val->count;
-}
-
 #endif
Index: arch/ppc32/include/atomic.h
===================================================================
--- arch/ppc32/include/atomic.h	(revision 45fb65c09103dff87bfb6916993a019f9309b363)
+++ arch/ppc32/include/atomic.h	(revision 23684b75fbd877e18cebd073cdb4a435652e8c2c)
@@ -31,6 +31,5 @@
 
 #include <arch/types.h>
-
-typedef struct { volatile __u32 count; } atomic_t;
+#include <typedefs.h>
 
 static inline void atomic_inc(atomic_t *val)
@@ -64,5 +63,5 @@
 }
 
-static inline __u32 atomic_postinc(atomic_t *val)
+static inline long atomic_postinc(atomic_t *val)
 {
 	atomic_inc(val);
@@ -70,5 +69,5 @@
 }
 
-static inline __u32 atomic_postdec(atomic_t *val)
+static inline long atomic_postdec(atomic_t *val)
 {
 	atomic_dec(val);
@@ -76,5 +75,5 @@
 }
 
-static inline __u32 atomic_preinc(atomic_t *val)
+static inline long atomic_preinc(atomic_t *val)
 {
 	atomic_inc(val);
@@ -82,5 +81,5 @@
 }
 
-static inline __u32 atomic_predec(atomic_t *val)
+static inline long atomic_predec(atomic_t *val)
 {
 	atomic_dec(val);
@@ -88,13 +87,3 @@
 }
 
-static inline void atomic_set(atomic_t *val, __u32 i)
-{
-	val->count = i;
-}
-
-static inline __u32 atomic_get(atomic_t *val)
-{
-	return val->count;
-}
-
 #endif
Index: arch/sparc64/include/atomic.h
===================================================================
--- arch/sparc64/include/atomic.h	(revision 45fb65c09103dff87bfb6916993a019f9309b363)
+++ arch/sparc64/include/atomic.h	(revision 23684b75fbd877e18cebd073cdb4a435652e8c2c)
@@ -31,6 +31,5 @@
 
 #include <arch/types.h>
-
-typedef struct { volatile __u64 count; } atomic_t;
+#include <typedefs.h>
 
 /** Atomic add operation.
@@ -43,5 +42,5 @@
  * @return Value of the atomic variable as it existed before addition.
  */
-static inline count_t atomic_add(atomic_t *val, int i)
+static inline long atomic_add(atomic_t *val, int i)
 {
 	__u64 a, b;
@@ -63,20 +62,20 @@
 }
 
-static inline count_t atomic_preinc(atomic_t *val)
+static inline long atomic_preinc(atomic_t *val)
 {
 	return atomic_add(val, 1) + 1;
 }
 
-static inline count_t atomic_postinc(atomic_t *val)
+static inline long atomic_postinc(atomic_t *val)
 {
 	return atomic_add(val, 1);
 }
 
-static inline count_t atomic_predec(atomic_t *val)
+static inline long atomic_predec(atomic_t *val)
 {
 	return atomic_add(val, -1) - 1;
 }
 
-static inline count_t atomic_postdec(atomic_t *val)
+static inline long atomic_postdec(atomic_t *val)
 {
 	return atomic_add(val, -1);
@@ -93,13 +92,3 @@
 }
 
-static inline void atomic_set(atomic_t *val, __u64 i)
-{
-	val->count = i;
-}
-
-static inline __u64 atomic_get(atomic_t *val)
-{
-	return val->count;
-}
-
 #endif
Index: generic/include/atomic.h
===================================================================
--- generic/include/atomic.h	(revision 23684b75fbd877e18cebd073cdb4a435652e8c2c)
+++ generic/include/atomic.h	(revision 23684b75fbd877e18cebd073cdb4a435652e8c2c)
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2006 Jakub Jermar
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef __ATOMIC_H__
+#define __ATOMIC_H__
+
+struct atomic {
+	volatile long count;
+};
+
+#include <arch/atomic.h>
+#include <typedefs.h>
+
+static inline void atomic_set(atomic_t *val, long i)
+{
+        val->count = i;
+}
+
+static inline long atomic_get(atomic_t *val)
+{
+        return val->count;
+}
+
+#endif
Index: generic/include/func.h
===================================================================
--- generic/include/func.h	(revision 45fb65c09103dff87bfb6916993a019f9309b363)
+++ generic/include/func.h	(revision 23684b75fbd877e18cebd073cdb4a435652e8c2c)
@@ -32,5 +32,5 @@
 #include <arch/types.h>
 #include <typedefs.h>
-#include <arch/atomic.h>
+#include <atomic.h>
 
 extern atomic_t haltstate;
Index: generic/include/mm/slab.h
===================================================================
--- generic/include/mm/slab.h	(revision 45fb65c09103dff87bfb6916993a019f9309b363)
+++ generic/include/mm/slab.h	(revision 23684b75fbd877e18cebd073cdb4a435652e8c2c)
@@ -32,5 +32,5 @@
 #include <adt/list.h>
 #include <synch/spinlock.h>
-#include <arch/atomic.h>
+#include <atomic.h>
 #include <mm/frame.h>
 
Index: generic/include/proc/scheduler.h
===================================================================
--- generic/include/proc/scheduler.h	(revision 45fb65c09103dff87bfb6916993a019f9309b363)
+++ generic/include/proc/scheduler.h	(revision 23684b75fbd877e18cebd073cdb4a435652e8c2c)
@@ -33,5 +33,5 @@
 #include <time/clock.h>		/* HZ */
 #include <typedefs.h>
-#include <arch/atomic.h>
+#include <atomic.h>
 #include <adt/list.h>
 
Index: generic/include/synch/spinlock.h
===================================================================
--- generic/include/synch/spinlock.h	(revision 45fb65c09103dff87bfb6916993a019f9309b363)
+++ generic/include/synch/spinlock.h	(revision 23684b75fbd877e18cebd073cdb4a435652e8c2c)
@@ -33,5 +33,5 @@
 #include <typedefs.h>
 #include <preemption.h>
-#include <arch/atomic.h>
+#include <atomic.h>
 #include <debug.h>
 
Index: generic/include/typedefs.h
===================================================================
--- generic/include/typedefs.h	(revision 45fb65c09103dff87bfb6916993a019f9309b363)
+++ generic/include/typedefs.h	(revision 23684b75fbd877e18cebd073cdb4a435652e8c2c)
@@ -93,3 +93,5 @@
 typedef struct btree btree_t;
 
+typedef struct atomic atomic_t;
+
 #endif
Index: generic/src/console/console.c
===================================================================
--- generic/src/console/console.c	(revision 45fb65c09103dff87bfb6916993a019f9309b363)
+++ generic/src/console/console.c	(revision 23684b75fbd877e18cebd073cdb4a435652e8c2c)
@@ -37,5 +37,5 @@
 #include <func.h>
 #include <print.h>
-#include <arch/atomic.h>
+#include <atomic.h>
 
 #define BUFLEN 2048
Index: generic/src/mm/tlb.c
===================================================================
--- generic/src/mm/tlb.c	(revision 45fb65c09103dff87bfb6916993a019f9309b363)
+++ generic/src/mm/tlb.c	(revision 23684b75fbd877e18cebd073cdb4a435652e8c2c)
@@ -33,5 +33,5 @@
 #include <synch/spinlock.h>
 #include <typedefs.h>
-#include <arch/atomic.h>
+#include <atomic.h>
 #include <arch/interrupt.h>
 #include <config.h>
Index: generic/src/proc/scheduler.c
===================================================================
--- generic/src/proc/scheduler.c	(revision 45fb65c09103dff87bfb6916993a019f9309b363)
+++ generic/src/proc/scheduler.c	(revision 23684b75fbd877e18cebd073cdb4a435652e8c2c)
@@ -35,5 +35,5 @@
 #include <arch/asm.h>
 #include <arch/faddr.h>
-#include <arch/atomic.h>
+#include <atomic.h>
 #include <synch/spinlock.h>
 #include <config.h>
Index: generic/src/proc/thread.c
===================================================================
--- generic/src/proc/thread.c	(revision 45fb65c09103dff87bfb6916993a019f9309b363)
+++ generic/src/proc/thread.c	(revision 23684b75fbd877e18cebd073cdb4a435652e8c2c)
@@ -50,5 +50,5 @@
 #include <smp/ipi.h>
 #include <arch/faddr.h>
-#include <arch/atomic.h>
+#include <atomic.h>
 #include <memstr.h>
 #include <print.h>
Index: generic/src/synch/spinlock.c
===================================================================
--- generic/src/synch/spinlock.c	(revision 45fb65c09103dff87bfb6916993a019f9309b363)
+++ generic/src/synch/spinlock.c	(revision 23684b75fbd877e18cebd073cdb4a435652e8c2c)
@@ -28,5 +28,5 @@
 
 #include <synch/spinlock.h>
-#include <arch/atomic.h>
+#include <atomic.h>
 #include <arch/barrier.h>
 #include <arch.h>
Index: generic/src/time/clock.c
===================================================================
--- generic/src/time/clock.c	(revision 45fb65c09103dff87bfb6916993a019f9309b363)
+++ generic/src/time/clock.c	(revision 23684b75fbd877e18cebd073cdb4a435652e8c2c)
@@ -39,5 +39,5 @@
 #include <arch.h>
 #include <adt/list.h>
-#include <arch/atomic.h>
+#include <atomic.h>
 #include <proc/thread.h>
 
Index: test/atomic/atomic1/test.c
===================================================================
--- test/atomic/atomic1/test.c	(revision 45fb65c09103dff87bfb6916993a019f9309b363)
+++ test/atomic/atomic1/test.c	(revision 23684b75fbd877e18cebd073cdb4a435652e8c2c)
@@ -29,5 +29,5 @@
 #include <test.h>
 #include <print.h>
-#include <arch/atomic.h>
+#include <atomic.h>
 #include <debug.h>
 
Index: test/debug/mips1/test.c
===================================================================
--- test/debug/mips1/test.c	(revision 45fb65c09103dff87bfb6916993a019f9309b363)
+++ test/debug/mips1/test.c	(revision 23684b75fbd877e18cebd073cdb4a435652e8c2c)
@@ -32,5 +32,5 @@
 
 #include <test.h>
-#include <arch/atomic.h>
+#include <atomic.h>
 #include <proc/thread.h>
 #include <time/delay.h>
Index: test/fault/fault1/test.c
===================================================================
--- test/fault/fault1/test.c	(revision 45fb65c09103dff87bfb6916993a019f9309b363)
+++ test/fault/fault1/test.c	(revision 23684b75fbd877e18cebd073cdb4a435652e8c2c)
@@ -33,5 +33,5 @@
 
 #include <test.h>
-#include <arch/atomic.h>
+#include <atomic.h>
 #include <proc/thread.h>
 
Index: test/fpu/fpu1/test.c
===================================================================
--- test/fpu/fpu1/test.c	(revision 45fb65c09103dff87bfb6916993a019f9309b363)
+++ test/fpu/fpu1/test.c	(revision 23684b75fbd877e18cebd073cdb4a435652e8c2c)
@@ -33,5 +33,5 @@
 
 #include <test.h>
-#include <arch/atomic.h>
+#include <atomic.h>
 #include <proc/thread.h>
 
Index: test/fpu/mips1/test.c
===================================================================
--- test/fpu/mips1/test.c	(revision 45fb65c09103dff87bfb6916993a019f9309b363)
+++ test/fpu/mips1/test.c	(revision 23684b75fbd877e18cebd073cdb4a435652e8c2c)
@@ -32,5 +32,5 @@
 
 #include <test.h>
-#include <arch/atomic.h>
+#include <atomic.h>
 #include <proc/thread.h>
 #include <time/delay.h>
Index: test/fpu/sse1/test.c
===================================================================
--- test/fpu/sse1/test.c	(revision 45fb65c09103dff87bfb6916993a019f9309b363)
+++ test/fpu/sse1/test.c	(revision 23684b75fbd877e18cebd073cdb4a435652e8c2c)
@@ -32,5 +32,5 @@
 
 #include <test.h>
-#include <arch/atomic.h>
+#include <atomic.h>
 #include <proc/thread.h>
 #include <time/delay.h>
Index: test/mm/falloc2/test.c
===================================================================
--- test/mm/falloc2/test.c	(revision 45fb65c09103dff87bfb6916993a019f9309b363)
+++ test/mm/falloc2/test.c	(revision 23684b75fbd877e18cebd073cdb4a435652e8c2c)
@@ -33,5 +33,5 @@
 #include <arch/mm/page.h>
 #include <arch/types.h>
-#include <arch/atomic.h>
+#include <atomic.h>
 #include <debug.h>
 #include <proc/thread.h>
Index: test/synch/rwlock1/test.c
===================================================================
--- test/synch/rwlock1/test.c	(revision 45fb65c09103dff87bfb6916993a019f9309b363)
+++ test/synch/rwlock1/test.c	(revision 23684b75fbd877e18cebd073cdb4a435652e8c2c)
@@ -29,5 +29,5 @@
 #include <test.h>
 #include <arch.h>
-#include <arch/atomic.h>
+#include <atomic.h>
 #include <print.h>
 #include <proc/thread.h>
Index: test/synch/rwlock2/test.c
===================================================================
--- test/synch/rwlock2/test.c	(revision 45fb65c09103dff87bfb6916993a019f9309b363)
+++ test/synch/rwlock2/test.c	(revision 23684b75fbd877e18cebd073cdb4a435652e8c2c)
@@ -29,5 +29,5 @@
 #include <test.h>
 #include <arch.h>
-#include <arch/atomic.h>
+#include <atomic.h>
 #include <print.h>
 #include <proc/thread.h>
Index: test/synch/rwlock3/test.c
===================================================================
--- test/synch/rwlock3/test.c	(revision 45fb65c09103dff87bfb6916993a019f9309b363)
+++ test/synch/rwlock3/test.c	(revision 23684b75fbd877e18cebd073cdb4a435652e8c2c)
@@ -29,5 +29,5 @@
 #include <test.h>
 #include <arch.h>
-#include <arch/atomic.h>
+#include <atomic.h>
 #include <print.h>
 #include <proc/thread.h>
Index: test/synch/rwlock4/test.c
===================================================================
--- test/synch/rwlock4/test.c	(revision 45fb65c09103dff87bfb6916993a019f9309b363)
+++ test/synch/rwlock4/test.c	(revision 23684b75fbd877e18cebd073cdb4a435652e8c2c)
@@ -29,5 +29,5 @@
 #include <test.h>
 #include <arch.h>
-#include <arch/atomic.h>
+#include <atomic.h>
 #include <print.h>
 #include <proc/thread.h>
Index: test/synch/rwlock5/test.c
===================================================================
--- test/synch/rwlock5/test.c	(revision 45fb65c09103dff87bfb6916993a019f9309b363)
+++ test/synch/rwlock5/test.c	(revision 23684b75fbd877e18cebd073cdb4a435652e8c2c)
@@ -29,5 +29,5 @@
 #include <test.h>
 #include <arch.h>
-#include <arch/atomic.h>
+#include <atomic.h>
 #include <print.h>
 #include <proc/thread.h>
Index: test/synch/semaphore1/test.c
===================================================================
--- test/synch/semaphore1/test.c	(revision 45fb65c09103dff87bfb6916993a019f9309b363)
+++ test/synch/semaphore1/test.c	(revision 23684b75fbd877e18cebd073cdb4a435652e8c2c)
@@ -29,5 +29,5 @@
 #include <test.h>
 #include <arch.h>
-#include <arch/atomic.h>
+#include <atomic.h>
 #include <print.h>
 #include <proc/thread.h>
Index: test/synch/semaphore2/test.c
===================================================================
--- test/synch/semaphore2/test.c	(revision 45fb65c09103dff87bfb6916993a019f9309b363)
+++ test/synch/semaphore2/test.c	(revision 23684b75fbd877e18cebd073cdb4a435652e8c2c)
@@ -29,5 +29,5 @@
 #include <test.h>
 #include <arch.h>
-#include <arch/atomic.h>
+#include <atomic.h>
 #include <print.h>
 #include <proc/thread.h>
Index: test/thread/thread1/test.c
===================================================================
--- test/thread/thread1/test.c	(revision 45fb65c09103dff87bfb6916993a019f9309b363)
+++ test/thread/thread1/test.c	(revision 23684b75fbd877e18cebd073cdb4a435652e8c2c)
@@ -33,5 +33,5 @@
 
 #include <test.h>
-#include <arch/atomic.h>
+#include <atomic.h>
 #include <proc/thread.h>