[Xen-changelog] [xen master] mini-os: eliminate duplicated definition of spin_unlock_wait

[patchbot@xxxxxxx]

commit 2548700af698867a303e90115a1fa8aa74be5945
Author:     Chen Baozi <baozich@xxxxxxxxx>
AuthorDate: Thu May 9 16:31:01 2013 +0800
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Thu Jul 4 10:55:12 2013 +0100

    mini-os: eliminate duplicated definition of spin_unlock_wait
    
    Signed-off-by: Chen Baozi <baozich@xxxxxxxxx>
    Acked-by: Samuel Thibault <samuel.thibault@xxxxxxxxxxxx>
---
 extras/mini-os/include/spinlock.h          |    2 +-
 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 70cf20f..6604e3c 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 4b8faf7..c08b6f1 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" \
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog