| commit | a71aefc66f6d4bf1302e0ce5c321aff1a2c769d1 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu Feb 23 12:29:10 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 23 12:29:10 2012 -0800 |
| tree | 06260b92df3f65c201b175017e3f7a9cde56a1b1 | |
| parent | 62daffe147e8810ce48a897df46b0b3db95ebaa3 [diff] | |
| parent | d041bf2095f5f133c87f7ba632a8dfb39537a437 [diff] |
am d041bf20: Merge "bionic/x86: fix one potential deadlock in __set_tls()" * commit 'd041bf2095f5f133c87f7ba632a8dfb39537a437': bionic/x86: fix one potential deadlock in __set_tls()
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 @@ if (rc != 0) { /* could not set thread local area */ + pthread_mutex_unlock(&_tls_desc_lock); return -1; }