diff --git a/[refs] b/[refs] index 5c42b37a5f68..564c4fb354c6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b40b5162ac4e5b94d16cd9fb0a87168b1633c7dd +refs/heads/master: dc07e721a26ec7e0adb66340f1763d220cfbbd0c diff --git a/trunk/include/linux/spinlock.h b/trunk/include/linux/spinlock.h index 576a5f77d3bd..1129ee0a7180 100644 --- a/trunk/include/linux/spinlock.h +++ b/trunk/include/linux/spinlock.h @@ -341,6 +341,9 @@ static inline void double_spin_unlock(spinlock_t *l1, spinlock_t *l2, * atomic_dec_and_lock - lock on reaching reference count zero * @atomic: the atomic counter * @lock: the spinlock in question + * + * Decrements @atomic by 1. If the result is 0, returns true and locks + * @lock. Returns false for all other cases. */ extern int _atomic_dec_and_lock(atomic_t *atomic, spinlock_t *lock); #define atomic_dec_and_lock(atomic, lock) \