Fixed bug with CE higher priority

2 files changed, 2 insertions, 6 deletions

diff --git a/litmus/ce_domain.c b/litmus/ce_domain.c
index 5e1f7ccc000c..fd9904e29a08 100644
--- a/litmus/ce_domain.c
+++ b/litmus/ce_domain.c
@@ -67,12 +67,11 @@ struct task_struct* ce_peek_and_take_ready(domain_t *dom)
         return ret;
 }
 
-int ce_higher_prio(struct task_struct *_a, struct task_struct *_b)
+int ce_higher_prio(struct task_struct *a, struct task_struct *b)
 {
-        const struct task_struct *a = _a;
         const domain_t *dom = get_task_domain(a);
         const struct ce_dom_data *ce_data = dom->data;
-        return (a == ce_data->should_schedule);
+        return (a != b && a == ce_data->should_schedule);
 }
 
 void ce_domain_init(domain_t *dom,
diff --git a/litmus/event_group.c b/litmus/event_group.c
index f2ee9158294b..0535f9f9bf96 100644
--- a/litmus/event_group.c
+++ b/litmus/event_group.c
@@ -37,9 +37,6 @@ static enum hrtimer_restart on_timer(struct hrtimer *timer)
 
         el = container_of(timer, struct event_list, timer);
 
-        VTRACE("Firing event at time %llu or %llu",
-               ktime_to_ns(timer->_expires), ktime_to_ns(timer->_softexpires));
-
         raw_spin_lock_irqsave(&el->group->queue_lock, flags);
         VTRACE("Removing event list 0x%p\n", el);
         list_del_init(&el->queue_node);