diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-11-16 13:57:50 -0500 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-11-24 08:41:13 -0500 |
| commit | a49ed0bf427a8328a3296eebedc7697fe5098dbf (patch) | |
| tree | b2add5cbe839899d58b2a43126e59b80801157ed /include/linux | |
| parent | c9286b7e293a1ea054e857ff3f5a23d0ad8d4f36 (diff) | |
locking: Use __[SPIN|RW]_LOCK_UNLOCKED in [spin|rw]_lock_init()
SPIN_LOCK_UNLOCKED and RW_LOCK_UNLOCKED are deprecated. Replace them
with the __*_LOCK_UNLOCKED variants.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/spinlock.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/spinlock.h b/include/linux/spinlock.h index faf1482028df..71dccfeb0d88 100644 --- a/include/linux/spinlock.h +++ b/include/linux/spinlock.h | |||
| @@ -100,7 +100,7 @@ do { \ | |||
| 100 | 100 | ||
| 101 | #else | 101 | #else |
| 102 | # define spin_lock_init(lock) \ | 102 | # define spin_lock_init(lock) \ |
| 103 | do { *(lock) = SPIN_LOCK_UNLOCKED; } while (0) | 103 | do { *(lock) = __SPIN_LOCK_UNLOCKED(lock); } while (0) |
| 104 | #endif | 104 | #endif |
| 105 | 105 | ||
| 106 | #ifdef CONFIG_DEBUG_SPINLOCK | 106 | #ifdef CONFIG_DEBUG_SPINLOCK |
| @@ -114,7 +114,7 @@ do { \ | |||
| 114 | } while (0) | 114 | } while (0) |
| 115 | #else | 115 | #else |
| 116 | # define rwlock_init(lock) \ | 116 | # define rwlock_init(lock) \ |
| 117 | do { *(lock) = RW_LOCK_UNLOCKED; } while (0) | 117 | do { *(lock) = __RW_LOCK_UNLOCKED(lock); } while (0) |
| 118 | #endif | 118 | #endif |
| 119 | 119 | ||
| 120 | #define spin_is_locked(lock) __raw_spin_is_locked(&(lock)->raw_lock) | 120 | #define spin_is_locked(lock) __raw_spin_is_locked(&(lock)->raw_lock) |