about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--linuxthreads/ChangeLog5
-rw-r--r--linuxthreads/spinlock.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 62567dad4d..661dfd21bc 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,8 @@
+2000-07-18  Ulrich Drepper  <drepper@redhat.com>
+
+	* spinlock.c (__pthread_alt_timedlock): Add back one of the
+	removed thread_self calls.
+
 2000-07-18  Kaz Kylheku  <kaz@ashi.footprints.net>
 
 	* spinlock.c (__pthread_alt_lock, __pthread_alt_timedlock): Changed
diff --git a/linuxthreads/spinlock.c b/linuxthreads/spinlock.c
index 4ed4203970..6cd2679d98 100644
--- a/linuxthreads/spinlock.c
+++ b/linuxthreads/spinlock.c
@@ -478,7 +478,8 @@ int __pthread_alt_timedlock(struct _pthread_fastlock * lock,
       newstatus = 1;
     } else {
       if (self == NULL)
-	p_wait_node->thr = self;
+	self = thread_self();
+      p_wait_node->thr = self;
       newstatus = (long) p_wait_node;
     }
     p_wait_node->abandoned = 0;