diff options
| author | Chen Baozi <baozich@gmail.com> | 2013-05-09 16:31:01 +0800 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2013-07-04 10:55:12 +0100 |
| commit | 2548700af698867a303e90115a1fa8aa74be5945 (patch) | |
| tree | 18b5dca3561a2105d82b7f07f686637ae6cc37fb /extras | |
| parent | af5102b81fd036976e785aa29dece8c3d2dd6577 (diff) | |
| download | xen-2548700af698867a303e90115a1fa8aa74be5945.tar.gz xen-2548700af698867a303e90115a1fa8aa74be5945.tar.bz2 xen-2548700af698867a303e90115a1fa8aa74be5945.zip | |
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>
Diffstat (limited to 'extras')
| -rw-r--r-- | extras/mini-os/include/spinlock.h | 2 | ||||
| -rw-r--r-- | extras/mini-os/include/x86/arch_spinlock.h | 2 |
2 files changed, 2 insertions, 2 deletions
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" \ |