summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-05-06 08:46:27 +0200
committerIngo Molnar <mingo@elte.hu>2009-05-06 08:47:26 +0200
commit3611dfb8eda847c1c8e1a052f57206f7fddc6a7c (patch)
tree74b5d689be8bfca2ec0fe18961ccaf6953c21dba /include
parent16c8a10932aef971292c9570eb5f60b5d4e83ed2 (diff)
parenta511e3f968c462a55ef58697257f5347c73d306e (diff)
downloadop-kernel-dev-3611dfb8eda847c1c8e1a052f57206f7fddc6a7c.zip
op-kernel-dev-3611dfb8eda847c1c8e1a052f57206f7fddc6a7c.tar.gz
Merge branch 'core/locking' into perfcounters/core
Merge reason: we moved a mutex.h commit that originated from the perfcounters tree into core/locking - but now merge back that branch to solve a merge artifact and to pick up cleanups of this commit that happened in core/locking. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include')
-rw-r--r--include/linux/mutex.h24
1 files changed, 1 insertions, 23 deletions
diff --git a/include/linux/mutex.h b/include/linux/mutex.h
index 93054fc..878cab4 100644
--- a/include/linux/mutex.h
+++ b/include/linux/mutex.h
@@ -150,28 +150,6 @@ extern int __must_check mutex_lock_killable(struct mutex *lock);
*/
extern int mutex_trylock(struct mutex *lock);
extern void mutex_unlock(struct mutex *lock);
-
-/**
- * atomic_dec_and_mutex_lock - return holding mutex if we dec to 0
- * @cnt: the atomic which we are to dec
- * @lock: the mutex to return holding if we dec to 0
- *
- * return true and hold lock if we dec to 0, return false otherwise
- */
-static inline int atomic_dec_and_mutex_lock(atomic_t *cnt, struct mutex *lock)
-{
- /* dec if we can't possibly hit 0 */
- if (atomic_add_unless(cnt, -1, 1))
- return 0;
- /* we might hit 0, so take the lock */
- mutex_lock(lock);
- if (!atomic_dec_and_test(cnt)) {
- /* when we actually did the dec, we didn't hit 0 */
- mutex_unlock(lock);
- return 0;
- }
- /* we hit 0, and we hold the lock */
- return 1;
-}
+extern int atomic_dec_and_mutex_lock(atomic_t *cnt, struct mutex *lock);
#endif
OpenPOWER on IntegriCloud