From 3d773274ad6caaf7e0431c3d5eeb31f727b53d1a Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Tue, 7 Oct 2014 23:31:06 +0000 Subject: [PATCH] Revert "Work around a bug in Immersion's libImmEmulatorJ.so." This reverts commit 7d3f553f989f830976efa92ddc3c84661d4d42aa. Change-Id: I8909b6aa1d97e9a61dbe95a2d91b9fbe336b58f0 --- libc/bionic/pthread_mutex.cpp | 12 ------------ libc/include/pthread.h | 4 ++-- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/libc/bionic/pthread_mutex.cpp b/libc/bionic/pthread_mutex.cpp index b338e516d..cbb6ef7a4 100644 --- a/libc/bionic/pthread_mutex.cpp +++ b/libc/bionic/pthread_mutex.cpp @@ -448,12 +448,6 @@ static inline __always_inline int _recursive_increment(pthread_mutex_t* mutex, i } int pthread_mutex_lock(pthread_mutex_t* mutex) { -#if !defined(__LP64__) - if (mutex == NULL) { - return EINVAL; - } -#endif - int mvalue, mtype, tid, shared; mvalue = mutex->value; @@ -532,12 +526,6 @@ int pthread_mutex_lock(pthread_mutex_t* mutex) { } int pthread_mutex_unlock(pthread_mutex_t* mutex) { -#if !defined(__LP64__) - if (mutex == NULL) { - return EINVAL; - } -#endif - int mvalue, mtype, tid, shared; mvalue = mutex->value; diff --git a/libc/include/pthread.h b/libc/include/pthread.h index c32890b03..86a10051e 100644 --- a/libc/include/pthread.h +++ b/libc/include/pthread.h @@ -206,10 +206,10 @@ int pthread_mutexattr_settype(pthread_mutexattr_t*, int) __nonnull((1)); int pthread_mutex_destroy(pthread_mutex_t*) __nonnull((1)); int pthread_mutex_init(pthread_mutex_t*, const pthread_mutexattr_t*) __nonnull((1)); -int pthread_mutex_lock(pthread_mutex_t*) /* __nonnull((1)) */; +int pthread_mutex_lock(pthread_mutex_t*) __nonnull((1)); int pthread_mutex_timedlock(pthread_mutex_t*, const struct timespec*) __nonnull((1, 2)); int pthread_mutex_trylock(pthread_mutex_t*) __nonnull((1)); -int pthread_mutex_unlock(pthread_mutex_t*) /* __nonnull((1)) */; +int pthread_mutex_unlock(pthread_mutex_t*) __nonnull((1)); int pthread_once(pthread_once_t*, void (*)(void)) __nonnull((1, 2));