diff --git a/[refs] b/[refs] index fd05c21edae6..ea623363b57d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d1a76187a5be4f89c6cb19d800cb5fb7aac735c5 +refs/heads/master: d98d38f2014ab79f28c126ff175d034891f7aefc diff --git a/trunk/include/linux/mutex.h b/trunk/include/linux/mutex.h index bc6da10ceee0..7a0e5c4f8072 100644 --- a/trunk/include/linux/mutex.h +++ b/trunk/include/linux/mutex.h @@ -144,6 +144,8 @@ extern int __must_check mutex_lock_killable(struct mutex *lock); /* * NOTE: mutex_trylock() follows the spin_trylock() convention, * not the down_trylock() convention! + * + * Returns 1 if the mutex has been acquired successfully, and 0 on contention. */ extern int mutex_trylock(struct mutex *lock); extern void mutex_unlock(struct mutex *lock);