From f2dd10b7d1e1144d54e65a5a4030648cdab092eb Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 27 Jul 2011 17:17:49 +0000 Subject: [PATCH] 2011-07-27 Joel Sherrill * posix/src/pthread.c, posix/src/pthreadjoin.c: Revert accidental commit. --- cpukit/ChangeLog | 5 +++++ cpukit/posix/src/pthread.c | 2 +- cpukit/posix/src/pthreadjoin.c | 6 ------ 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 20f7d00ff3..afa6c52e7c 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,8 @@ +2011-07-27 Joel Sherrill + + * posix/src/pthread.c, posix/src/pthreadjoin.c: Revert accidental + commit. + 2011-07-27 Petr Benes PR 1856/cpukit diff --git a/cpukit/posix/src/pthread.c b/cpukit/posix/src/pthread.c index 0212da3378..3890144aa5 100644 --- a/cpukit/posix/src/pthread.c +++ b/cpukit/posix/src/pthread.c @@ -217,7 +217,7 @@ bool _POSIX_Threads_Create_extension( _Thread_queue_Initialize( &api->Join_List, THREAD_QUEUE_DISCIPLINE_FIFO, - STATES_WAITING_FOR_JOIN_AT_EXIT | STATES_INTERRUPTIBLE_BY_SIGNAL, + STATES_WAITING_FOR_JOIN_AT_EXIT, 0 ); diff --git a/cpukit/posix/src/pthreadjoin.c b/cpukit/posix/src/pthreadjoin.c index 71b0e3e27e..8ee9888b94 100644 --- a/cpukit/posix/src/pthreadjoin.c +++ b/cpukit/posix/src/pthreadjoin.c @@ -32,7 +32,6 @@ int pthread_join( Objects_Locations location; void *return_pointer; -on_EINTR: the_thread = _Thread_Get( thread, &location ); switch ( location ) { @@ -61,11 +60,6 @@ on_EINTR: _Thread_Enable_dispatch(); -/* - if ( _Thread_Executing->Wait.return_code == EINTR ) - goto on_EINTR; -*/ - if ( value_ptr ) *value_ptr = return_pointer; return 0;