Index: generic/include/atomic.h
===================================================================
--- generic/include/atomic.h	(revision d71007efd9bf1adac91d39ec37befb57a9123574)
+++ generic/include/atomic.h	(revision d71007efd9bf1adac91d39ec37befb57a9123574)
@@ -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 018d957e20e03bd2a5c78e93cd9916eb0d1d222b)
+++ generic/include/func.h	(revision d71007efd9bf1adac91d39ec37befb57a9123574)
@@ -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 018d957e20e03bd2a5c78e93cd9916eb0d1d222b)
+++ generic/include/mm/slab.h	(revision d71007efd9bf1adac91d39ec37befb57a9123574)
@@ -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 018d957e20e03bd2a5c78e93cd9916eb0d1d222b)
+++ generic/include/proc/scheduler.h	(revision d71007efd9bf1adac91d39ec37befb57a9123574)
@@ -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 018d957e20e03bd2a5c78e93cd9916eb0d1d222b)
+++ generic/include/synch/spinlock.h	(revision d71007efd9bf1adac91d39ec37befb57a9123574)
@@ -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 018d957e20e03bd2a5c78e93cd9916eb0d1d222b)
+++ generic/include/typedefs.h	(revision d71007efd9bf1adac91d39ec37befb57a9123574)
@@ -93,3 +93,5 @@
 typedef struct btree btree_t;
 
+typedef struct atomic atomic_t;
+
 #endif