1 files changed, 4 insertions, 5 deletions
diff --git a/cpukit/posix/src/sigtimedwait.c b/cpukit/posix/src/sigtimedwait.c
index 8d86ba72a9..fb8a243a0a 100644
--- a/cpukit/posix/src/sigtimedwait.c
+++ b/cpukit/posix/src/sigtimedwait.c
@@ -152,17 +152,16 @@ int sigtimedwait(
   the_info->si_signo = -1;
 
   _Thread_Disable_dispatch();
-    executing->Wait.queue           = &_POSIX_signals_Wait_queue;
     executing->Wait.return_code     = EINTR;
     executing->Wait.option          = *set;
     executing->Wait.return_argument = the_info;
-    _Thread_queue_Enter_critical_section( &_POSIX_signals_Wait_queue );
-    _POSIX_signals_Release( &lock_context );
-    _Thread_queue_Enqueue(
+    _Thread_queue_Enqueue_critical(
       &_POSIX_signals_Wait_queue,
       executing,
       STATES_WAITING_FOR_SIGNAL | STATES_INTERRUPTIBLE_BY_SIGNAL,
-      interval
+      interval,
+      EAGAIN,
+      &lock_context
     );
   _Thread_Enable_dispatch();