Index: xenomai-2.3.x/include/asm-generic/hal.h
===================================================================
--- xenomai-2.3.x/include/asm-generic/hal.h	(Revision 3130)
+++ xenomai-2.3.x/include/asm-generic/hal.h	(Arbeitskopie)
@@ -84,20 +84,27 @@
 
 typedef struct ipipe_domain rthal_pipeline_stage_t;
 
-#ifdef IPIPE_RW_LOCK_UNLOCKED
+#ifdef IPIPE_SPIN_LOCK_UNLOCKED
 typedef ipipe_spinlock_t rthal_spinlock_t;
 #define RTHAL_SPIN_LOCK_UNLOCKED IPIPE_SPIN_LOCK_UNLOCKED
+#else /* !IPIPE_SPIN_LOCK_UNLOCKED */
+#ifdef RAW_SPIN_LOCK_UNLOCKED
+typedef raw_spinlock_t rthal_spinlock_t;
+#define RTHAL_SPIN_LOCK_UNLOCKED RAW_SPIN_LOCK_UNLOCKED
+#else /* !RAW_SPIN_LOCK_UNLOCKED */
+typedef spinlock_t rthal_spinlock_t;
+#define RTHAL_SPIN_LOCK_UNLOCKED SPIN_LOCK_UNLOCKED
+#endif /* !RAW_SPIN_LOCK_UNLOCKED */
+#endif /* !IPIPE_SPIN_LOCK_UNLOCKED */
+
+#ifdef IPIPE_RW_LOCK_UNLOCKED
 typedef ipipe_rwlock_t rthal_rwlock_t;
 #define RTHAL_RW_LOCK_UNLOCKED   IPIPE_RW_LOCK_UNLOCKED
 #else /* !IPIPE_RW_LOCK_UNLOCKED */
 #ifdef RAW_RW_LOCK_UNLOCKED
-typedef raw_spinlock_t rthal_spinlock_t;
-#define RTHAL_SPIN_LOCK_UNLOCKED RAW_SPIN_LOCK_UNLOCKED
 typedef raw_rwlock_t rthal_rwlock_t;
 #define RTHAL_RW_LOCK_UNLOCKED RAW_RW_LOCK_UNLOCKED
 #else /* !RAW_RW_LOCK_UNLOCKED */
-typedef spinlock_t rthal_spinlock_t;
-#define RTHAL_SPIN_LOCK_UNLOCKED SPIN_LOCK_UNLOCKED
 typedef rwlock_t rthal_rwlock_t;
 #define RTHAL_RW_LOCK_UNLOCKED RW_LOCK_UNLOCKED
 #endif /* RAW_RW_LOCK_UNLOCKED */