Skip to contentSkip to conversation

mini-os: eliminate duplicated definition of spin_unlock_wait

PATCH Applied Chen Baozi 3 participants 5 messages May 9, 2013 – Jul 4, 2013

lore
Share & tools
lore

Chen Baozi

author
#0 lore raw

PATCH 1/1 mini-os: eliminate duplicated definition of spin_unlock_wait

---
 extras/mini-os/include/spinlock.h          | 2 +-
 extras/mini-os/include/x86/arch_spinlock.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
extras/mini-os/include/spinlock.h +1 -1
index 70cf20f..6604e3c 100644
@@ -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) ? \
extras/mini-os/include/x86/arch_spinlock.h +1 -1
index 4b8faf7..c08b6f1 100644
@@ -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" \
Signature · 1 line
1.8.1.4
Acked-by on v1 1/1
#1 lore raw
Quoted 1 line · Chen Baozi, le Thu 09 May 2013 16:31:01 +0800, a écrit :
Quoted 34 lines
---
 extras/mini-os/include/spinlock.h          | 2 +-
 extras/mini-os/include/x86/arch_spinlock.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
extras/mini-os/include/spinlock.h +1 -1
index 70cf20f..6604e3c 100644
@@ -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) ? \
extras/mini-os/include/x86/arch_spinlock.h +1 -1
index 4b8faf7..c08b6f1 100644
@@ -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" \
Signature · 1 line
1.8.1.4
Signature · 5 lines
Samuel
R: Parce que ça renverse bêtement l'ordre naturel de lecture!
Q: Mais pourquoi citer en fin d'article est-il si effroyable?
R: Citer en fin d'article
Q: Quelle est la chose la plus désagréable sur les groupes de news?