Merge branch 'master' of ssh://router/data/git/fio

[fio.git] / arch / arch.h

diff --git a/arch/arch.h b/arch/arch.h
index 00163570f82c04f9de2825af424fae28b5d43a2d..28c6632638c7c61dd32d1edff73c865fe85b4737 100644 (file)
--- a/arch/arch.h
+++ b/arch/arch.h
@@ -10,6 +10,7 @@ enum {
        arch_alpha,
        arch_sparc,
        arch_sparc64,
+       arch_arm,
 };
 
 #if defined(__i386__)
@@ -28,6 +29,8 @@ enum {
 #include "arch-sparc.h"
 #elif defined(__sparc64__)
 #include "arch-sparc64.h"
+#elif defined(__arm__)
+#include "arch-arm.h"
 #else
 #error "Unsupported arch"
 #endif
@@ -38,9 +41,4 @@ enum {
 #include "../lib/ffz.h"
 #endif
 
-static inline void spin_lock_init(spinlock_t *lock)
-{
-       lock->lock = 0;
-}
-
 #endif