int pthread_mutex_lock(pthread_mutex_t *m)
{
int r;
- while ((r=pthread_mutex_trylock(m)) == EBUSY)
- __wait(&m->__lock, &m->__waiters, 1, 0);
+ while ((r=pthread_mutex_trylock(m)) == EBUSY) {
+ if (m->_m_type == PTHREAD_MUTEX_ERRORCHECK
+ && m->_m_owner == pthread_self()->tid)
+ return EDEADLK;
+ __wait(&m->_m_lock, &m->_m_waiters, 1, 0);
+ }
return r;
}