1 files changed, 14 insertions, 7 deletions
diff --git a/cpukit/posix/src/nanosleep.c b/cpukit/posix/src/nanosleep.c
index b59b9934b0..7d37480218 100644
--- a/cpukit/posix/src/nanosleep.c
+++ b/cpukit/posix/src/nanosleep.c
@@ -39,6 +39,12 @@ int nanosleep(
   struct timespec        *rmtp
 )
 {
+  /*
+   * It is critical to obtain the executing thread after thread dispatching is
+   * disabled on SMP configurations.
+   */
+  Thread_Control *executing;
+
   Watchdog_Interval  ticks;
 
 
@@ -61,7 +67,8 @@ int nanosleep(
 
   if ( !ticks ) {
     _Thread_Disable_dispatch();
-      _Scheduler_Yield();
+      executing = _Thread_Executing;
+      _Scheduler_Yield( executing );
     _Thread_Enable_dispatch();
     if ( rmtp ) {
        rmtp->tv_sec = 0;
@@ -74,24 +81,24 @@ int nanosleep(
    *  Block for the desired amount of time
    */
   _Thread_Disable_dispatch();
+    executing = _Thread_Executing;
     _Thread_Set_state(
-      _Thread_Executing,
+      executing,
       STATES_DELAYING | STATES_INTERRUPTIBLE_BY_SIGNAL
     );
     _Watchdog_Initialize(
-      &_Thread_Executing->Timer,
+      &executing->Timer,
       _Thread_Delay_ended,
-      _Thread_Executing->Object.id,
+      executing->Object.id,
       NULL
     );
-    _Watchdog_Insert_ticks( &_Thread_Executing->Timer, ticks );
+    _Watchdog_Insert_ticks( &executing->Timer, ticks );
   _Thread_Enable_dispatch();
 
   /* calculate time remaining */
 
   if ( rmtp ) {
-    ticks -=
-      _Thread_Executing->Timer.stop_time - _Thread_Executing->Timer.start_time;
+    ticks -= executing->Timer.stop_time - executing->Timer.start_time;
 
     _Timespec_From_ticks( ticks, rmtp );