am c51e9208: am dc3fb119: Merge "Updated ambiguous comment in pthread_mutex_lock."

* commit 'c51e92086a574c7209b8310925212f06eaa6ba20':
  Updated ambiguous comment in pthread_mutex_lock.
This commit is contained in:
Dan Albert 2014-05-28 22:13:22 +00:00 committed by Android Git Automerger
commit e4f5ae5d54

View File

@ -451,7 +451,7 @@ int pthread_mutex_lock(pthread_mutex_t* mutex) {
mtype = (mvalue & MUTEX_TYPE_MASK);
shared = (mvalue & MUTEX_SHARED_MASK);
/* Handle normal case first */
/* Handle non-recursive case first */
if ( __predict_true(mtype == MUTEX_TYPE_BITS_NORMAL) ) {
_normal_lock(mutex, shared);
return 0;