Merge branch 'prop/robust-tie-break' into wip-gpu-rtas12

Conflicts:
	include/litmus/binheap.h
	include/litmus/fdso.h
	include/litmus/litmus.h
	litmus/Makefile
	litmus/binheap.c
	litmus/edf_common.c
	litmus/fdso.c
	litmus/jobs.c
	litmus/locking.c

1 files changed, 8 insertions, 8 deletions

diff --git a/litmus/sched_gsn_edf.c b/litmus/sched_gsn_edf.c
index 8c48757fa86c..11304d634661 100644
--- a/litmus/sched_gsn_edf.c
+++ b/litmus/sched_gsn_edf.c
@@ -22,6 +22,7 @@
 #include <litmus/sched_trace.h>
 
 #include <litmus/preempt.h>
+#include <litmus/budget.h>
 
 #include <litmus/bheap.h>
 #include <litmus/binheap.h>
@@ -136,7 +137,7 @@ DEFINE_PER_CPU(cpu_entry_t, gsnedf_cpu_entries);
 cpu_entry_t* gsnedf_cpus[NR_CPUS];
 
 /* the cpus queue themselves according to priority in here */
-static struct binheap_handle gsnedf_cpu_heap;
+static struct binheap gsnedf_cpu_heap;
 
 static rt_domain_t gsnedf;
 #define gsnedf_lock (gsnedf.ready_lock)
@@ -340,11 +341,11 @@ static void check_for_preemptions(void)
                                                 &per_cpu(gsnedf_cpu_entries, task_cpu(task)));
                         if (affinity)
                                 last = affinity;
-                        else if (last->linked)
+                        else if (requeue_preempted_job(last->linked))
                                 requeue(last->linked);
                 }
 #else
-                if (last->linked)
+                if (requeue_preempted_job(last->linked))
                         requeue(last->linked);
 #endif
 
@@ -786,9 +787,8 @@ static struct task_struct* gsnedf_schedule(struct task_struct * prev)
         /* (0) Determine state */
         exists      = entry->scheduled != NULL;
         blocks      = exists && !is_running(entry->scheduled);
-        out_of_time = exists &&
-                                  budget_enforced(entry->scheduled) &&
-                                  budget_exhausted(entry->scheduled);
+        out_of_time = exists && budget_enforced(entry->scheduled)
+                && budget_exhausted(entry->scheduled);
         np          = exists && is_np(entry->scheduled);
         sleep       = exists && get_rt_flags(entry->scheduled) == RT_F_SLEEP;
         preempt     = entry->scheduled != entry->linked;
@@ -837,9 +837,9 @@ static struct task_struct* gsnedf_schedule(struct task_struct * prev)
         /* Any task that is preemptable and either exhausts its execution
          * budget or wants to sleep completes. We may have to reschedule after
          * this. Don't do a job completion if we block (can't have timers running
-         * for blocked jobs). Preemption go first for the same reason.
+         * for blocked jobs).
          */
-        if (!np && (out_of_time || sleep) && !blocks && !preempt)
+        if (!np && (out_of_time || sleep) && !blocks)
                 job_completion(entry->scheduled, !sleep);
 
         /* Link pending task if we became unlinked.