From ee09f78d8faa0b988088d93142e6f5f8a6e75394 Mon Sep 17 00:00:00 2001 From: Andrea Bastoni Date: Mon, 21 Dec 2009 12:23:57 -0500 Subject: Refactor binomial heap names: heap -> bheap - Binomial heap "heap" names conflicted with priority heap of cgroup in kernel - This patch change binomial heap "heap" names in "bheap" --- litmus/edf_common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'litmus/edf_common.c') diff --git a/litmus/edf_common.c b/litmus/edf_common.c index 97e37761cedc..06daec66c984 100644 --- a/litmus/edf_common.c +++ b/litmus/edf_common.c @@ -68,9 +68,9 @@ int edf_higher_prio(struct task_struct* first, !second->rt_param.inh_task)))); } -int edf_ready_order(struct heap_node* a, struct heap_node* b) +int edf_ready_order(struct bheap_node* a, struct bheap_node* b) { - return edf_higher_prio(heap2task(a), heap2task(b)); + return edf_higher_prio(bheap2task(a), bheap2task(b)); } void edf_domain_init(rt_domain_t* rt, check_resched_needed_t resched, -- cgit v1.2.2