am 5d8fd2a0: am a71aefc6: am d041bf20: Merge "bionic/x86: fix one potential deadlock in __set_tls()"

* commit '5d8fd2a0bc059cd07405a372c98617829f8ac378':
  bionic/x86: fix one potential deadlock in __set_tls()
This commit is contained in:
Jean-Baptiste Queru 2012-02-23 12:34:02 -08:00 committed by Android Git Automerger
commit 7dbbfac0fc

View File

@ -83,6 +83,7 @@ int __set_tls(void *ptr)
if (rc != 0)
{
/* could not set thread local area */
pthread_mutex_unlock(&_tls_desc_lock);
return -1;
}