am d041bf20
: Merge "bionic/x86: fix one potential deadlock in __set_tls()"
* commit 'd041bf2095f5f133c87f7ba632a8dfb39537a437': bionic/x86: fix one potential deadlock in __set_tls()
This commit is contained in:

committed by
Android Git Automerger

commit
a71aefc66f
@@ -83,6 +83,7 @@ int __set_tls(void *ptr)
|
|||||||
if (rc != 0)
|
if (rc != 0)
|
||||||
{
|
{
|
||||||
/* could not set thread local area */
|
/* could not set thread local area */
|
||||||
|
pthread_mutex_unlock(&_tls_desc_lock);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user