Clean up use of spin_is_locked() and introduce rw_is_locked().

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

1 files changed, 5 insertions, 1 deletions

diff --git a/xen/include/xen/spinlock.h b/xen/include/xen/spinlock.h
index fec4264590..7a5a5ab5d7 100644
--- a/xen/include/xen/spinlock.h
+++ b/xen/include/xen/spinlock.h
@@ -72,6 +72,8 @@ void _write_unlock(rwlock_t *lock);
 void _write_unlock_irq(rwlock_t *lock);
 void _write_unlock_irqrestore(rwlock_t *lock, unsigned long flags);
 
+int _rw_is_locked(rwlock_t *lock);
+
 #define spin_lock(l)                  _spin_lock(l)
 #define spin_lock_irq(l)              _spin_lock_irq(l)
 #define spin_lock_irqsave(l, f)       ((f) = _spin_lock_irqsave(l))
@@ -80,7 +82,7 @@ void _write_unlock_irqrestore(rwlock_t *lock, unsigned long flags);
 #define spin_unlock_irq(l)            _spin_unlock_irq(l)
 #define spin_unlock_irqrestore(l, f)  _spin_unlock_irqrestore(l, f)
 
-#define spin_is_locked(l)             _raw_spin_is_locked(&(l)->raw)
+#define spin_is_locked(l)             _spin_is_locked(l)
 #define spin_trylock(l)               _spin_trylock(l)
 
 /* Ensure a lock is quiescent between two critical operations. */
@@ -113,4 +115,6 @@ void _write_unlock_irqrestore(rwlock_t *lock, unsigned long flags);
 #define write_unlock_irq(l)           _write_unlock_irq(l)
 #define write_unlock_irqrestore(l, f) _write_unlock_irqrestore(l, f)
 
+#define rw_is_locked(l)               _rw_is_locked(l)
+
 #endif /* __SPINLOCK_H__ */