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()

1 files changed, 24 insertions, 1 deletions

diff --git a/kernel/mutex.c b/kernel/mutex.c
index 6ca5fe96e39..e5cc0cd28d5 100644
--- a/kernel/mutex.c
+++ b/kernel/mutex.c
@@ -473,5 +473,28 @@ int __sched mutex_trylock(struct mutex *lock)
 
         return ret;
 }
-
 EXPORT_SYMBOL(mutex_trylock);
+
+/**
+ * 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
+ */
+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;
+}
+EXPORT_SYMBOL(atomic_dec_and_mutex_lock);