Update.

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>.

diff --git a/ChangeLog b/ChangeLog
index 9277e73853b0a89acc82d953e1769707d36b47e8..4b1f8d4cc4c266d1ba0be5d66e08451d6159db70 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.

diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 725653b02c034e76c4b897c98c609b2e62dea29d..d600f27c39d67782301974c538424025fedb46f0 100644 (file)
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -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.

diff --git a/linuxthreads/condvar.c b/linuxthreads/condvar.c
index d1e91d228ca867d3107240c4daa0e298f08320f7..023e5c6884ea8158bdeb8b0013e34b415a879b34 100644 (file)
--- a/linuxthreads/condvar.c
+++ b/linuxthreads/condvar.c
@@ -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);
 }