commit 62daffe147e8810ce48a897df46b0b3db95ebaa3
author Jean-Baptiste Queru <jbq@google.com> Wed Feb 22 09:54:52 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Feb 22 09:54:52 2012 -0800
tree a5f55a64c5119ba31a0c30e4d61683e8b64d0d8c
parent cfff36df2bebd95f2663b7b053c6308593c343dd
parent f9c5afb1f9d8e615ab98774a10bbf117962db66d

am f9c5afb1: Merge "Redesign dlopen() locks to be recursive per thread."

* commit 'f9c5afb1f9d8e615ab98774a10bbf117962db66d':
  Redesign dlopen() locks to be recursive per thread.

linker/dlfcn.c

diff --git a/linker/dlfcn.c b/linker/dlfcn.c
index 5964bd1..194a4ae 100644
--- a/linker/dlfcn.c
+++ b/linker/dlfcn.c
@@ -42,7 +42,7 @@
 #define likely(expr)   __builtin_expect (expr, 1)
 #define unlikely(expr) __builtin_expect (expr, 0)
 
-static pthread_mutex_t dl_lock = PTHREAD_MUTEX_INITIALIZER;
+pthread_mutex_t dl_lock = PTHREAD_RECURSIVE_MUTEX_INITIALIZER;
 
 static void set_dlerror(int err)
 {