Refactor to allow generic domains

1 files changed, 8 insertions, 4 deletions

diff --git a/litmus/rt_domain.c b/litmus/rt_domain.c
index f781a2c61fc6..65c6e5c02f1e 100644
--- a/litmus/rt_domain.c
+++ b/litmus/rt_domain.c
@@ -20,7 +20,7 @@
 
 
 /* Uncomment when debugging timer races... */
-#if 0
+#if 1
 #define VTRACE_TASK TRACE_TASK
 #define VTRACE TRACE
 #else
@@ -367,6 +367,7 @@ static void pd_requeue(domain_t *dom, struct task_struct *task)
         rt_domain_t *domain = (rt_domain_t*)dom->data;
         BUG_ON(!task || !is_realtime(task));
         BUG_ON(is_queued(task));
+        BUG_ON(get_task_domain(task) != dom);
 
         if (is_released(task, litmus_clock())) {
                 __add_ready(domain, task);
@@ -396,17 +397,20 @@ static struct task_struct* pd_peek_ready(domain_t *dom)
 
 /* pd_domain_init - create a generic domain wrapper for an rt_domain
  */
-void pd_domain_init(domain_t *dom, bheap_prio_t order,
+void pd_domain_init(domain_t *dom,
+                    bheap_prio_t order,
                     check_resched_needed_t check,
                     release_jobs_t release,
-                    preempt_needed_t preempt_needed)
+                    preempt_needed_t preempt_needed,
+                    task_prio_t priority)
 {
         rt_domain_t *domain = kmalloc(sizeof(rt_domain_t), GFP_ATOMIC);
 
         rt_domain_init(domain, order, check, release);
         domain_init(dom, &domain->ready_lock,
                     pd_requeue, pd_peek_ready, pd_take_ready,
-                    preempt_needed);
+                    preempt_needed, priority);
+        dom->data = domain;
 }
 
 void pd_domain_free(domain_t *dom)