1 files changed, 5 insertions, 4 deletions
diff --git a/cpukit/score/src/coretodset.c b/cpukit/score/src/coretodset.c
index 7c7731aae0..3d117589a1 100644
--- a/cpukit/score/src/coretodset.c
+++ b/cpukit/score/src/coretodset.c
@@ -36,6 +36,11 @@ void _TOD_Set_with_timestamp(
   _Thread_Disable_dispatch();
 
   seconds_now = _TOD_Seconds_since_epoch();
+
+  _TOD_Acquire( tod, &lock_context );
+  tod->now = *tod_as_timestamp;
+  _TOD_Release( tod, &lock_context );
+
   header = &_Watchdog_Seconds_header;
 
   if ( seconds_next < seconds_now )
@@ -43,10 +48,6 @@ void _TOD_Set_with_timestamp(
   else
     _Watchdog_Adjust_forward( header, seconds_next - seconds_now );
 
-  _TOD_Acquire( tod, &lock_context );
-  tod->now = *tod_as_timestamp;
-  _TOD_Release( tod, &lock_context );
-
   tod->seconds_trigger = nanoseconds;
   tod->is_set = true;