am e6c27a7a: Merge "Fix a typo in the big g_ search/replace."

* commit 'e6c27a7af7a9b13e4e3d3ebd604d28effa9e9322':
  Fix a typo in the big g_ search/replace.
This commit is contained in:
Elliott Hughes 2014-05-14 18:02:53 +00:00 committed by Android Git Automerger
commit 7451897cd4

View File

@ -52,7 +52,7 @@ extern "C" __attribute__((noinline)) void _thread_created_hook(pid_t) {}
extern "C" __LIBC_HIDDEN__ void __init_user_desc(struct user_desc*, int, void*);
#endif
static pthread_mutex_t g_pthread_stack_creation_ock = PTHREAD_MUTEX_INITIALIZER;
static pthread_mutex_t g_pthread_stack_creation_lock = PTHREAD_MUTEX_INITIALIZER;
static pthread_mutex_t g_debugger_notification_lock = PTHREAD_MUTEX_INITIALIZER;
@ -111,7 +111,7 @@ int __init_thread(pthread_internal_t* thread, bool add_to_thread_list) {
}
static void* __create_thread_stack(pthread_internal_t* thread) {
ScopedPthreadMutexLocker lock(&g_pthread_stack_creation_ock);
ScopedPthreadMutexLocker lock(&g_pthread_stack_creation_lock);
// Create a new private anonymous map.
int prot = PROT_READ | PROT_WRITE;