7 files changed, 33 insertions, 40 deletions

diff --git a/Makefile b/Makefile
index 62bcf4e..2540bba 100644
--- a/Makefile
+++ b/Makefile
@@ -149,8 +149,6 @@ obj-runtests = $(patsubst tests/%.c,%.o,${src-runtests})
 test_catalog.inc: $(filter-out tests/runner.c,${src-runtests})
         tests/make_catalog.py $+ > $@
 
-.SECONDARY: test_catalog.inc
-
 tests/runner.c: test_catalog.inc
 
 
diff --git a/arch/sparc64/include/asm/cycles.h b/arch/sparc/include/asm/cycles.h
index ce0e8ce..ce0e8ce 100644
--- a/arch/sparc64/include/asm/cycles.h
+++ b/arch/sparc/include/asm/cycles.h
diff --git a/include/asm_sparc.h b/arch/sparc64/include/asm/atomic.h
index 96c8049..cabaa5a 100644
--- a/include/asm_sparc.h
+++ b/arch/sparc64/include/asm/atomic.h
@@ -1,5 +1,7 @@
+#ifndef ASM_ATOMIC_H
+#define ASM_ATOMIC_H
+
 /* sparc64 assembly.
- * Don't include directly, use asm.h instead.
  *
  * Most of this code comes straight out of the Linux kernel.
  *
@@ -46,18 +48,18 @@ typedef struct { int counter; } atomic_t;
 /**
  * atomic_read - read atomic variable
  * @v: pointer of type atomic_t
- * 
+ *
  * Atomically reads the value of @v.
- */ 
+ */
 #define atomic_read(v)          ((v)->counter)
 
 /**
  * atomic_set - set atomic variable
  * @v: pointer of type atomic_t
  * @i: required value
- * 
+ *
  * Atomically sets the value of @v to @i.
- */ 
+ */
 #define atomic_set(v,i)         (((v)->counter) = (i))
 
 
@@ -70,18 +72,18 @@ typedef struct { int counter; } atomic_t;
  */
 static __inline__ int atomic_add_return(int i, atomic_t *v)
 {
-        int old; 
+        int old;
         int ret;
         goto first;
         do {
                 cpu_relax();
         first:
                 old = atomic_read(v);
-                ret = cmpxchg(&v->counter, old, old + i);               
+                ret = cmpxchg(&v->counter, old, old + i);
         } while (ret != old);
         return old + i;
 }
- 
+
 static __inline__ void atomic_add(int i, atomic_t *v)
 {
         atomic_add_return(i, v);
@@ -90,3 +92,4 @@ static __inline__ void atomic_add(int i, atomic_t *v)
 #define atomic_inc_return(v)  (atomic_add_return(1,v))
 
 
+#endif
diff --git a/include/asm_x86.h b/arch/x86/include/asm/atomic.h
index ccc6cce..4bd1fe2 100644
--- a/include/asm_x86.h
+++ b/arch/x86/include/asm/atomic.h
@@ -1,6 +1,7 @@
-/* Intel ia32 assembly.
- * Don't include directly, use asm.h instead.
- *
+#ifndef ASM_ATOMIC_H
+#define ASM_ATOMIC_H
+
+/*
  * Most of this code comes straight out of the Linux kernel.
  *
  * The terms of the GPL v2 apply.
@@ -16,17 +17,6 @@ static __inline__ void cpu_relax(void)
         __asm__ __volatile("pause");
 }
 
-/* please, use these only if you _really_ know what you're doing
- * ... and remember iopl(3) first!! (include sys/io.h)
- */
-static inline void cli(void) {
-        asm volatile("cli": : :"memory");
-}
-
-static inline void sti(void) {
-        asm volatile("sti": : :"memory");
-}
-
 typedef struct { int counter; } atomic_t;
 
 #ifdef __i386__
@@ -142,3 +132,5 @@ static inline int atomic_add_return(int i, atomic_t *v)
 #define atomic_inc_return(v)  (atomic_add_return(1, v))
 
 #endif
+
+#endif
diff --git a/arch/x86/include/asm/irq.h b/arch/x86/include/asm/irq.h
new file mode 100644
index 0000000..23f47fd
--- /dev/null
+++ b/arch/x86/include/asm/irq.h
@@ -0,0 +1,15 @@
+#ifndef ASM_IRQ_H
+#define ASM_IRQ_H
+
+/* please, use these only if you _really_ know what you're doing
+ * ... and remember iopl(3) first!! (include sys/io.h)
+ */
+static inline void cli(void) {
+        asm volatile("cli": : :"memory");
+}
+
+static inline void sti(void) {
+        asm volatile("sti": : :"memory");
+}
+
+#endif
diff --git a/include/asm.h b/include/asm.h
deleted file mode 100644
index bc15fae..0000000
--- a/include/asm.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* liblitmus platform dependent includes */
-
-#ifndef ASM_H
-#define ASM_H
-
-#if defined(__i386__) || defined(__x86_64__)
-#include "asm_x86.h"
-#endif
-
-
-#ifdef __sparc__
-#include "asm_sparc.h"
-#endif
-
-#endif
diff --git a/src/kernel_iface.c b/src/kernel_iface.c
index afb6202..25e0cea 100644
--- a/src/kernel_iface.c
+++ b/src/kernel_iface.c
@@ -8,7 +8,7 @@
 
 #include "litmus.h"
 #include "internal.h"
-#include "asm.h"
+#include "asm/atomic.h"
 
 #define LITMUS_CTRL_DEVICE "/dev/litmus/ctrl"
 #define CTRL_PAGES 1