3 files changed, 7 insertions, 2 deletions
diff --git a/cpukit/rtems/src/ratemoncancel.c b/cpukit/rtems/src/ratemoncancel.c
index 0b75d53fd7..ec6d450e85 100644
--- a/cpukit/rtems/src/ratemoncancel.c
+++ b/cpukit/rtems/src/ratemoncancel.c
@@ -53,6 +53,7 @@ rtems_status_code rtems_rate_monotonic_cancel(
       }
       (void) _Watchdog_Remove( &the_period->Timer );
       the_period->state = RATE_MONOTONIC_INACTIVE;
+      _Scheduler_Release_job(the_period->owner, 0);
       _Thread_Enable_dispatch();
       return RTEMS_SUCCESSFUL;
 
diff --git a/cpukit/rtems/src/ratemondelete.c b/cpukit/rtems/src/ratemondelete.c
index 7349e5ed51..1ce298a497 100644
--- a/cpukit/rtems/src/ratemondelete.c
+++ b/cpukit/rtems/src/ratemondelete.c
@@ -51,6 +51,7 @@ rtems_status_code rtems_rate_monotonic_delete(
       (void) _Watchdog_Remove( &the_period->Timer );
       the_period->state = RATE_MONOTONIC_INACTIVE;
       _Rate_monotonic_Free( the_period );
+      _Scheduler_Release_job(the_period->owner, 0);
       _Thread_Enable_dispatch();
       return RTEMS_SUCCESSFUL;
 
diff --git a/cpukit/rtems/src/ratemonperiod.c b/cpukit/rtems/src/ratemonperiod.c
index 1c18344955..4af3f90b5b 100644
--- a/cpukit/rtems/src/ratemonperiod.c
+++ b/cpukit/rtems/src/ratemonperiod.c
@@ -143,6 +143,8 @@ void _Rate_monotonic_Initiate_statistics(
       _Timespec_Add_to( &the_period->cpu_usage_period_initiated, &ran );
     }
   #endif
+
+  _Scheduler_Release_job(the_period->owner, the_period->next_length);
 }
 
 void _Rate_monotonic_Update_statistics(
@@ -282,6 +284,8 @@ rtems_status_code rtems_rate_monotonic_period(
       if ( the_period->state == RATE_MONOTONIC_INACTIVE ) {
         _ISR_Enable( level );
 
+        the_period->next_length = length;
+
         /*
          *  Baseline statistics information for the beginning of a period.
          */
@@ -295,8 +299,6 @@ rtems_status_code rtems_rate_monotonic_period(
           NULL
         );
 
-        the_period->next_length = length;
-
         _Watchdog_Insert_ticks( &the_period->Timer, length );
         _Thread_Enable_dispatch();
         return RTEMS_SUCCESSFUL;
@@ -353,6 +355,7 @@ rtems_status_code rtems_rate_monotonic_period(
         the_period->next_length = length;
 
         _Watchdog_Insert_ticks( &the_period->Timer, length );
+        _Scheduler_Release_job(the_period->owner, the_period->next_length);
         _Thread_Enable_dispatch();
         return RTEMS_TIMEOUT;
       }