diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-10 19:19:40 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-10 19:19:40 -0400 |
| commit | e7241d771419b8a8671ebc46a043c324ccb0dcf7 (patch) | |
| tree | 77f1bc9c635e2ac29396816ce9ef9cbdb6853884 /include/linux/mutex.h | |
| parent | 3f6280ddf25fa656d0e17960588e52bee48a7547 (diff) | |
| parent | 04dce7d9d429ea5ea04e9432d1726c930f4d67da (diff) | |
Merge branch 'locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
spinlock: Add missing __raw_spin_lock_flags() stub for UP
mutex: add atomic_dec_and_mutex_lock(), fix
locking, rtmutex.c: Documentation cleanup
mutex: add atomic_dec_and_mutex_lock()
Diffstat (limited to 'include/linux/mutex.h')
| -rw-r--r-- | include/linux/mutex.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/mutex.h b/include/linux/mutex.h index 3069ec7e0ab8..878cab4f5fcc 100644 --- a/include/linux/mutex.h +++ b/include/linux/mutex.h | |||
| @@ -150,5 +150,6 @@ extern int __must_check mutex_lock_killable(struct mutex *lock); | |||
| 150 | */ | 150 | */ |
| 151 | extern int mutex_trylock(struct mutex *lock); | 151 | extern int mutex_trylock(struct mutex *lock); |
| 152 | extern void mutex_unlock(struct mutex *lock); | 152 | extern void mutex_unlock(struct mutex *lock); |
| 153 | extern int atomic_dec_and_mutex_lock(atomic_t *cnt, struct mutex *lock); | ||
| 153 | 154 | ||
| 154 | #endif | 155 | #endif |