1 files changed, 8 insertions, 11 deletions

diff --git a/litmus/fp_common.c b/litmus/fp_common.c
index 7898955fd991..8536da9ca98a 100644
--- a/litmus/fp_common.c
+++ b/litmus/fp_common.c
@@ -66,13 +66,9 @@ int fp_higher_prio(struct task_struct* first,
 
         return !is_realtime(second_task)  ||
 
-                /* is the deadline of the first task earlier?
-                 * Then it has higher priority.
-                 */
                 get_priority(first_task) < get_priority(second_task) ||
 
-                /* Do we have a deadline tie?
-                 * Then break by PID.
+                /* Break by PID.
                  */
                 (get_priority(first_task) == get_priority(second_task) &&
                 (first_task->pid < second_task->pid ||
@@ -97,18 +93,19 @@ void fp_domain_init(rt_domain_t* rt, check_resched_needed_t resched,
 
 /* need_to_preempt - check whether the task t needs to be preempted
  */
-int fp_preemption_needed(rt_domain_t* rt, struct task_struct *t)
+int fp_preemption_needed(struct fp_prio_queue *q, struct task_struct *t)
 {
-        /* we need the read lock for edf_ready_queue */
-        /* no need to preempt if there is nothing pending */
-        if (!__jobs_pending(rt))
+        struct task_struct *pending;
+
+        pending = fp_prio_peek(q);
+
+        if (!pending)
                 return 0;
-        /* we need to reschedule if t doesn't exist */
         if (!t)
                 return 1;
 
         /* make sure to get non-rt stuff out of the way */
-        return !is_realtime(t) || fp_higher_prio(__next_ready(rt), t);
+        return !is_realtime(t) || fp_higher_prio(pending, t);
 }
 
 void fp_prio_queue_init(struct fp_prio_queue* q)