From bf57086c9aa497c016efc208a0ceb66f262ab18b Mon Sep 17 00:00:00 2001 From: Glenn Elliott Date: Wed, 21 Mar 2012 19:24:13 -0400 Subject: Make GSN-EDF work with simlified binheap_delete() --- litmus/sched_gsn_edf.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/litmus/sched_gsn_edf.c b/litmus/sched_gsn_edf.c index 549a4dad037d..ea83201319d7 100644 --- a/litmus/sched_gsn_edf.c +++ b/litmus/sched_gsn_edf.c @@ -141,7 +141,7 @@ static int cpu_lower_prio(struct binheap_node *_a, struct binheap_node *_b) static void update_cpu_position(cpu_entry_t *entry) { if (likely(entry->in_heap)) - binheap_delete(&entry->hn, &gsnedf_cpu_heap, cpu_entry_t, hn); + binheap_delete(&entry->hn, &gsnedf_cpu_heap); binheap_add(&entry->hn, &gsnedf_cpu_heap, cpu_entry_t, hn); entry->in_heap = 1; } @@ -666,8 +666,7 @@ static void set_priority_inheritance(struct task_struct* t, struct task_struct* * We can't use heap_decrease() here since * the cpu_heap is ordered in reverse direction, so * it is actually an increase. */ - binheap_delete(&gsnedf_cpus[linked_on]->hn, - &gsnedf_cpu_heap, cpu_entry_t, hn); + binheap_delete(&gsnedf_cpus[linked_on]->hn, &gsnedf_cpu_heap); binheap_add(&gsnedf_cpus[linked_on]->hn, &gsnedf_cpu_heap, cpu_entry_t, hn); } else { -- cgit v1.2.2