From: Chen Baozi Date: Thu, 9 May 2013 08:31:01 +0000 (+0800) Subject: mini-os: eliminate duplicated definition of spin_unlock_wait X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~6661 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2548700af698867a303e90115a1fa8aa74be5945;p=xen.git mini-os: eliminate duplicated definition of spin_unlock_wait Signed-off-by: Chen Baozi Acked-by: Samuel Thibault --- diff --git a/extras/mini-os/include/spinlock.h b/extras/mini-os/include/spinlock.h index 70cf20f17a..6604e3cb90 100644 --- a/extras/mini-os/include/spinlock.h +++ b/extras/mini-os/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/extras/mini-os/include/x86/arch_spinlock.h b/extras/mini-os/include/x86/arch_spinlock.h index 4b8faf75a8..c08b6f136e 100644 --- a/extras/mini-os/include/x86/arch_spinlock.h +++ b/extras/mini-os/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" \