(thread_func): Remove mutex_unlock call since it's never executed.

	(thread_func): Remove mutex_unlock call since it's never executed.

2 files changed, 2 insertions, 4 deletions

diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index a43d4acd46..85320d31ef 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -2,6 +2,7 @@
 
 	* sysdeps/pthread/timer_routines.c (thread_func): Add noreturn
 	attribute, remove statements that will never be executed.
+	(thread_func): Remove mutex_unlock call since it's never executed.
 
 	* manager.c (__pthread_manager): Add noreturn
 	attribute.
diff --git a/linuxthreads/sysdeps/pthread/timer_routines.c b/linuxthreads/sysdeps/pthread/timer_routines.c
index 71bc6dd814..e2b2be8b0d 100644
--- a/linuxthreads/sysdeps/pthread/timer_routines.c
+++ b/linuxthreads/sysdeps/pthread/timer_routines.c
@@ -439,12 +439,9 @@ thread_func (void *arg)
 	pthread_cond_wait (&self->cond, &__timer_mutex);
     }
   /* These statements will never be executed since the while loop
-     loops forever:
-  pthread_mutex_unlock (&__timer_mutex);
+     loops forever - but we have to add them for proper nesting.  */
   pthread_cleanup_pop (1);
 
-  return NULL;
-  */
 }