diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-02-23 12:32:37 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-02-23 12:32:37 -0800 |
| commit | 5d8fd2a0bc059cd07405a372c98617829f8ac378 (patch) | |
| tree | 06260b92df3f65c201b175017e3f7a9cde56a1b1 /libc | |
| parent | 49a05c060acd4d3e17b2819f00a694271bf40977 (diff) | |
| parent | a71aefc66f6d4bf1302e0ce5c321aff1a2c769d1 (diff) | |
| download | bionic-5d8fd2a0bc059cd07405a372c98617829f8ac378.zip bionic-5d8fd2a0bc059cd07405a372c98617829f8ac378.tar.gz bionic-5d8fd2a0bc059cd07405a372c98617829f8ac378.tar.bz2 | |
am a71aefc6: am d041bf20: Merge "bionic/x86: fix one potential deadlock in __set_tls()"
* commit 'a71aefc66f6d4bf1302e0ce5c321aff1a2c769d1':
bionic/x86: fix one potential deadlock in __set_tls()
Diffstat (limited to 'libc')
| -rwxr-xr-x | libc/arch-x86/bionic/__set_tls.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libc/arch-x86/bionic/__set_tls.c b/libc/arch-x86/bionic/__set_tls.c index e5e43b5..7ed4b01 100755 --- a/libc/arch-x86/bionic/__set_tls.c +++ b/libc/arch-x86/bionic/__set_tls.c @@ -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; } |