1 files changed, 18 insertions, 18 deletions

diff --git a/include/litmus/rt_domain.h b/include/litmus/rt_domain.h
index c7c55bef3e42..c780fdfcccae 100644
--- a/include/litmus/rt_domain.h
+++ b/include/litmus/rt_domain.h
@@ -5,14 +5,14 @@
 #ifndef __UNC_RT_DOMAIN_H__
 #define __UNC_RT_DOMAIN_H__
 
-#include <litmus/heap.h>
+#include <litmus/bheap.h>
 
 #define RELEASE_QUEUE_SLOTS 127 /* prime */
 
 struct _rt_domain;
 
 typedef int (*check_resched_needed_t)(struct _rt_domain *rt);
-typedef void (*release_jobs_t)(struct _rt_domain *rt, struct heap* tasks);
+typedef void (*release_jobs_t)(struct _rt_domain *rt, struct bheap* tasks);
 
 struct release_queue {
         /* each slot maintains a list of release heaps sorted
@@ -23,7 +23,7 @@ struct release_queue {
 typedef struct _rt_domain {
         /* runnable rt tasks are in here */
         spinlock_t                      ready_lock;
-        struct heap                     ready_queue;
+        struct bheap                    ready_queue;
 
         /* real-time tasks waiting for release are in here */
         spinlock_t                      release_lock;
@@ -41,7 +41,7 @@ typedef struct _rt_domain {
         release_jobs_t                  release_jobs;
 
         /* how are tasks ordered in the ready queue? */
-        heap_prio_t                     order;
+        bheap_prio_t                    order;
 } rt_domain_t;
 
 struct release_heap {
@@ -49,7 +49,7 @@ struct release_heap {
         struct list_head                list;
         lt_t                            release_time;
         /* all tasks to be released at release_time */
-        struct heap                     heap;
+        struct bheap                    heap;
         /* used to trigger the release */
         struct hrtimer                  timer;
         /* used to delegate releases */
@@ -61,47 +61,47 @@ struct release_heap {
 
 static inline struct task_struct* __next_ready(rt_domain_t* rt)
 {
-        struct heap_node *hn = heap_peek(rt->order, &rt->ready_queue);
+        struct bheap_node *hn = bheap_peek(rt->order, &rt->ready_queue);
         if (hn)
-                return heap2task(hn);
+                return bheap2task(hn);
         else
                 return NULL;
 }
 
-void rt_domain_init(rt_domain_t *rt, heap_prio_t order,
+void rt_domain_init(rt_domain_t *rt, bheap_prio_t order,
                     check_resched_needed_t check,
                     release_jobs_t relase);
 
 void __add_ready(rt_domain_t* rt, struct task_struct *new);
-void __merge_ready(rt_domain_t* rt, struct heap *tasks);
+void __merge_ready(rt_domain_t* rt, struct bheap *tasks);
 void __add_release(rt_domain_t* rt, struct task_struct *task);
 
 static inline struct task_struct* __take_ready(rt_domain_t* rt)
 {
-        struct heap_node* hn = heap_take(rt->order, &rt->ready_queue);
+        struct bheap_node* hn = bheap_take(rt->order, &rt->ready_queue);
         if (hn)
-                return heap2task(hn);
+                return bheap2task(hn);
         else
                 return NULL;
 }
 
 static inline struct task_struct* __peek_ready(rt_domain_t* rt)
 {
-        struct heap_node* hn = heap_peek(rt->order, &rt->ready_queue);
+        struct bheap_node* hn = bheap_peek(rt->order, &rt->ready_queue);
         if (hn)
-                return heap2task(hn);
+                return bheap2task(hn);
         else
                 return NULL;
 }
 
 static inline int  is_queued(struct task_struct *t)
 {
-        return heap_node_in_heap(tsk_rt(t)->heap_node);
+        return bheap_node_in_heap(tsk_rt(t)->heap_node);
 }
 
 static inline void remove(rt_domain_t* rt, struct task_struct *t)
 {
-        heap_delete(rt->order, &rt->ready_queue, tsk_rt(t)->heap_node);
+        bheap_delete(rt->order, &rt->ready_queue, tsk_rt(t)->heap_node);
 }
 
 static inline void add_ready(rt_domain_t* rt, struct task_struct *new)
@@ -113,7 +113,7 @@ static inline void add_ready(rt_domain_t* rt, struct task_struct *new)
         spin_unlock_irqrestore(&rt->ready_lock, flags);
 }
 
-static inline void merge_ready(rt_domain_t* rt, struct heap* tasks)
+static inline void merge_ready(rt_domain_t* rt, struct bheap* tasks)
 {
         unsigned long flags;
         spin_lock_irqsave(&rt->ready_lock, flags);
@@ -144,7 +144,7 @@ static inline void add_release(rt_domain_t* rt, struct task_struct *task)
 
 static inline int __jobs_pending(rt_domain_t* rt)
 {
-        return !heap_empty(&rt->ready_queue);
+        return !bheap_empty(&rt->ready_queue);
 }
 
 static inline int jobs_pending(rt_domain_t* rt)
@@ -153,7 +153,7 @@ static inline int jobs_pending(rt_domain_t* rt)
         int ret;
         /* first we need the write lock for rt_ready_queue */
         spin_lock_irqsave(&rt->ready_lock, flags);
-        ret = !heap_empty(&rt->ready_queue);
+        ret = !bheap_empty(&rt->ready_queue);
         spin_unlock_irqrestore(&rt->ready_lock, flags);
         return ret;
 }