2000-03-14  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/unix/sysv/linux/alpha/ioperm.c (platform): Add entry for
	Nautilus.  Patch by Soohoon Lee <soohoon.lee@alpha-processor.com>.
This commit is contained in:
Ulrich Drepper 2000-03-15 07:52:41 +00:00
parent 5d1415976f
commit 04366d5f82
3 changed files with 15 additions and 5 deletions

View File

@ -1,3 +1,8 @@
2000-03-14 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/alpha/ioperm.c (platform): Add entry for
Nautilus. Patch by Soohoon Lee <soohoon.lee@alpha-processor.com>.
2000-03-08 Andreas Jaeger <aj@suse.de>
* sysdeps/unix/sysv/linux/scsi/sg.h: Sync with Linux 2.3.50.

View File

@ -2,7 +2,8 @@
* condvar.c (pthread_cond_wait): Check whether mutex is owned by
current thread and return error if not.
(pthread_cond_timedwait): Likewise.
(pthread_cond_timedwait_relative_old): Likewise.
(pthread_cond_timedwait_relative_new): Likewise.
* mutex.c (__pthread_once): Handle cancelled init function correctly.
(pthread_once_cancelhandler): New function.

View File

@ -143,6 +143,10 @@ pthread_cond_timedwait_relative_old(pthread_cond_t *cond,
sigjmp_buf jmpbuf;
pthread_extricate_if extr;
/* Check whether the mutex is locked and owned by this thread. */
if (mutex->__m_owner != self)
return EINVAL;
/* Set up extrication interface */
extr.pu_object = cond;
extr.pu_extricate_func = cond_extricate_func;
@ -270,6 +274,10 @@ pthread_cond_timedwait_relative_new(pthread_cond_t *cond,
sigjmp_buf jmpbuf;
pthread_extricate_if extr;
/* Check whether the mutex is locked and owned by this thread. */
if (mutex->__m_owner != self)
return EINVAL;
already_canceled = 0;
was_signalled = 0;
@ -384,10 +392,6 @@ pthread_cond_timedwait_relative_new(pthread_cond_t *cond,
int pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
const struct timespec * abstime)
{
/* Check whether the mutex is locked and owned by this thread. */
if (mutex->__m_owner != self)
return EINVAL;
/* Indirect call through pointer! */
return pthread_cond_tw_rel(cond, mutex, abstime);
}