3 files changed, 13 insertions, 11 deletions
diff --git a/cpukit/rtems/src/taskwakeafter.c b/cpukit/rtems/src/taskwakeafter.c
index 88de6e51a8..6f0322723a 100644
--- a/cpukit/rtems/src/taskwakeafter.c
+++ b/cpukit/rtems/src/taskwakeafter.c
@@ -42,8 +42,8 @@ rtems_status_code rtems_task_wake_after(
       _Watchdog_Initialize(
         &executing->Timer,
         _Thread_Delay_ended,
-        executing->Object.id,
-        NULL
+        0,
+        executing
       );
       _Watchdog_Insert_ticks( &executing->Timer, ticks );
     }
diff --git a/cpukit/rtems/src/taskwakewhen.c b/cpukit/rtems/src/taskwakewhen.c
index 01e855a125..a1fc15f047 100644
--- a/cpukit/rtems/src/taskwakewhen.c
+++ b/cpukit/rtems/src/taskwakewhen.c
@@ -29,6 +29,7 @@ rtems_status_code rtems_task_wake_when(
 )
 {
   Watchdog_Interval   seconds;
+  Thread_Control     *executing;
 
   if ( !_TOD_Is_set() )
     return RTEMS_NOT_DEFINED;
@@ -47,15 +48,16 @@ rtems_status_code rtems_task_wake_when(
     return RTEMS_INVALID_CLOCK;
 
   _Thread_Disable_dispatch();
-    _Thread_Set_state( _Thread_Executing, STATES_WAITING_FOR_TIME );
+    executing = _Thread_Executing;
+    _Thread_Set_state( executing, STATES_WAITING_FOR_TIME );
     _Watchdog_Initialize(
-      &_Thread_Executing->Timer,
+      &executing->Timer,
       _Thread_Delay_ended,
-      _Thread_Executing->Object.id,
-      NULL
+      0,
+      executing
     );
     _Watchdog_Insert_seconds(
-      &_Thread_Executing->Timer,
+      &executing->Timer,
       seconds - _TOD_Seconds_since_epoch()
     );
   _Thread_Enable_dispatch();
diff --git a/cpukit/rtems/src/timerserver.c b/cpukit/rtems/src/timerserver.c
index 76c7a3fe79..7523ebcdf4 100644
--- a/cpukit/rtems/src/timerserver.c
+++ b/cpukit/rtems/src/timerserver.c
@@ -551,14 +551,14 @@ rtems_status_code rtems_timer_initiate_server(
   _Watchdog_Initialize(
     &ts->Interval_watchdogs.System_watchdog,
     _Thread_Delay_ended,
-    id,
-    NULL
+    0,
+    ts->thread
   );
   _Watchdog_Initialize(
     &ts->TOD_watchdogs.System_watchdog,
     _Thread_Delay_ended,
-    id,
-    NULL
+    0,
+    ts->thread
   );
 
   /*