mini-os: eliminate duplicated definition of spin_unlock_wait

Signed-off-by: Chen Baozi <baozich@gmail.com>
Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org>

diff --git a/include/spinlock.h b/include/spinlock.h
index 70cf20f17abb6657fbd25f97dd3c6b759b233c64..6604e3cb90b08220d5ef75c8cb1bc5d61849164f 100644 (file)
--- a/include/spinlock.h
+++ b/include/spinlock.h
@@ -30,7 +30,7 @@ typedef struct {
 
 #define spin_is_locked(x)      arch_spin_is_locked(x)
 
-#define spin_unlock_wait(x)    do { barrier(); } while(spin_is_locked(x))
+#define spin_unlock_wait(x)    arch_spin_unlock_wait(x)
 
 
 #define _spin_trylock(lock)     ({_raw_spin_trylock(lock) ? \

diff --git a/include/x86/arch_spinlock.h b/include/x86/arch_spinlock.h
index 4b8faf75a8ca5a00271e6072b8df3178512f78d9..c08b6f136ef0202261e35080944bf77dc6c07b89 100644 (file)
--- a/include/x86/arch_spinlock.h
+++ b/include/x86/arch_spinlock.h
@@ -17,7 +17,7 @@
  */
 
 #define arch_spin_is_locked(x) (*(volatile signed char *)(&(x)->slock) <= 0)
-#define spin_unlock_wait(x)    do { barrier(); } while(spin_is_locked(x))
+#define arch_spin_unlock_wait(x) do { barrier(); } while(spin_is_locked(x))
 
 #define spin_lock_string \
         "1:\n" \