Merge branch 'gh/prop/completion-fix' into wip-2012.3-gpu-rtss13

Conflicts:
	include/litmus/budget.h
	litmus/sched_cedf.c
	litmus/sync.c

1 files changed, 15 insertions, 6 deletions

diff --git a/litmus/sync.c b/litmus/sync.c
index 01ea5d52f84b..93b7207b9361 100644
--- a/litmus/sync.c
+++ b/litmus/sync.c
@@ -55,14 +55,23 @@ static long do_wait_for_ts_release(struct timespec *wake)
                                         + current->rt_param.task_params.phase;
                         *wake = ns_to_timespec(phasedRelease);
 
-                        /* Completion succeeded, setup release. */
-                        litmus->release_at(current, phasedRelease
-                                                        - current->rt_param.task_params.period);
-                        /* trigger advance to next job release at the programmed time */
-                        ret = complete_job();
+                        /* Setting this flag before releasing ensures that this CPU
+                         * will be the next CPU to requeue the task on a ready or
+                         * release queue.
+                         */
+                        tsk_rt(current)->completed = 1;
+                        mb();
+
+                        /* completion succeeded, set up release. subtract off
+                         * period because schedule()->job_completion() will
+                         * advances us to the correct time */
+                        litmus->release_at(current,
+                                phasedRelease - current->rt_param.task_params.period);
+                        schedule();
                 }
-                else
+                else {
                         *wake = ns_to_timespec(wait.ts_release_time);
+                }
         } else {
                 /* We were interrupted, must cleanup list. */
                 mutex_lock(&task_release_lock);