4 files changed, 5 insertions, 4 deletions
diff --git a/cpukit/score/src/threadqenqueue.c b/cpukit/score/src/threadqenqueue.c
index 5f94ec99c9..590865d8dd 100644
--- a/cpukit/score/src/threadqenqueue.c
+++ b/cpukit/score/src/threadqenqueue.c
@@ -66,7 +66,7 @@ static void _Thread_blocking_operation_Finalize(
   if ( _Watchdog_Is_active( &the_thread->Timer ) ) {
     _Watchdog_Deactivate( &the_thread->Timer );
     _Thread_queue_Release( lock_context );
-    (void) _Watchdog_Remove( &the_thread->Timer );
+    _Watchdog_Remove_ticks( &the_thread->Timer );
   } else
     _Thread_queue_Release( lock_context );
 
diff --git a/cpukit/score/src/threadrestart.c b/cpukit/score/src/threadrestart.c
index e759b5b42b..8dea518e10 100644
--- a/cpukit/score/src/threadrestart.c
+++ b/cpukit/score/src/threadrestart.c
@@ -62,7 +62,7 @@ static void _Thread_Make_zombie( Thread_Control *the_thread )
 
   _Thread_Set_state( the_thread, STATES_ZOMBIE );
   _Thread_queue_Extract_with_proxy( the_thread );
-  _Watchdog_Remove( &the_thread->Timer );
+  _Watchdog_Remove_ticks( &the_thread->Timer );
 
   _ISR_lock_ISR_disable_and_acquire( &zombies->Lock, &lock_context );
   _Chain_Append_unprotected( &zombies->Chain, &the_thread->Object.Node );
@@ -235,7 +235,7 @@ static void _Thread_Start_life_change(
 
   _Thread_Set_state( the_thread, STATES_RESTARTING );
   _Thread_queue_Extract_with_proxy( the_thread );
-  _Watchdog_Remove( &the_thread->Timer );
+  _Watchdog_Remove_ticks( &the_thread->Timer );
   _Scheduler_Set_priority_if_higher( scheduler, the_thread, priority );
   _Thread_Add_post_switch_action( the_thread, &the_thread->Life.Action );
   _Thread_Ready( the_thread );
diff --git a/cpukit/score/src/watchdogremove.c b/cpukit/score/src/watchdogremove.c
index 34d97b0eae..d689e3cfc9 100644
--- a/cpukit/score/src/watchdogremove.c
+++ b/cpukit/score/src/watchdogremove.c
@@ -23,6 +23,7 @@
 #include <rtems/score/watchdogimpl.h>
 
 Watchdog_States _Watchdog_Remove(
+  Watchdog_Header  *header,
   Watchdog_Control *the_watchdog
 )
 {
diff --git a/cpukit/score/src/watchdogtickle.c b/cpukit/score/src/watchdogtickle.c
index 8c1a3a74b9..5b2f2582fc 100644
--- a/cpukit/score/src/watchdogtickle.c
+++ b/cpukit/score/src/watchdogtickle.c
@@ -74,7 +74,7 @@ void _Watchdog_Tickle(
   }
 
   do {
-     watchdog_state = _Watchdog_Remove( the_watchdog );
+     watchdog_state = _Watchdog_Remove( header, the_watchdog );
 
      _ISR_Enable( level );