Remove duplicate or unused functions + style cleanup

Reduces the size of our diff from upstream litmus and
should have no impact on functionality. Ported from MC^2.

6 files changed, 20 insertions, 36 deletions

diff --git a/include/litmus/litmus.h b/include/litmus/litmus.h
index 2081fab6c825..d8f6d633e688 100644
--- a/include/litmus/litmus.h
+++ b/include/litmus/litmus.h
@@ -6,6 +6,7 @@
 #ifndef _LINUX_LITMUS_H_
 #define _LINUX_LITMUS_H_
 
+#include <linux/sched.h>
 #include <litmus/ctrlpage.h>
 
 #ifdef CONFIG_RELEASE_MASTER
diff --git a/include/litmus/rt_domain.h b/include/litmus/rt_domain.h
index 691e2c15556c..16f6b6cd6357 100644
--- a/include/litmus/rt_domain.h
+++ b/include/litmus/rt_domain.h
@@ -29,13 +29,11 @@ typedef struct _rt_domain {
 
         /* real-time tasks waiting for release are in here */
         raw_spinlock_t                  release_lock;
-        struct release_queue    release_queue;
+        struct release_queue            release_queue;
 
 #ifdef CONFIG_RELEASE_MASTER
         int                             release_master;
-        /* used to delegate releases.
-         * does not appear to be assigned anywhere in Litmus
-         */
+        /* used to delegate releases */
         struct hrtimer_start_on_info    info;
 #endif
 
@@ -59,7 +57,8 @@ typedef struct _rt_domain {
 struct release_heap {
         /* for enqueueing into release_queue */
         struct binheap_node node;
-        struct list_head        list;
+        /* list_head for per-time-slot list */
+        struct list_head                list;
         lt_t                            release_time;
         /* all tasks to be released at release_time */
         struct bheap                    heap;
@@ -67,9 +66,6 @@ struct release_heap {
         struct list_head                list_head;
 };
 
-/* used to manually release jobs */
-void release_jobs_before_now(rt_domain_t* rt);
-
 void domain_suspend_releases(rt_domain_t* rt);
 void domain_resume_releases(rt_domain_t* rt);
 
@@ -100,9 +96,7 @@ void __merge_ready(rt_domain_t* rt, struct bheap *tasks);
 void __add_release(rt_domain_t* rt, struct task_struct *task);
 
 void __add_ready_res(rt_domain_t* rt, struct reservation* new);
-void __merge_ready_res(rt_domain_t* rt, struct bheap *res);
 void __add_release_res(rt_domain_t* rt, struct reservation* res);
-void __add_release_res_no_timer(rt_domain_t* rt, struct reservation* res);
 
 static inline struct task_struct* __take_ready(rt_domain_t* rt)
 {
@@ -146,7 +140,7 @@ static inline int  is_queued(struct task_struct *t)
         return bheap_node_in_heap(tsk_rt(t)->heap_node);
 }
 
-static inline int  is_queued_res(struct reservation* res)
+static inline int is_queued_res(struct reservation* res)
 {
         BUG_ON(!res->heap_node);
         return bheap_node_in_heap(res->heap_node);
@@ -192,7 +186,7 @@ static inline void merge_ready_res(rt_domain_t* rt, struct bheap* tasks)
 {
         unsigned long flags;
         raw_spin_lock_irqsave(&rt->ready_lock, flags);
-        __merge_ready_res(rt, tasks);
+        __merge_ready(rt, tasks);
         raw_spin_unlock_irqrestore(&rt->ready_lock, flags);
 }
 
diff --git a/litmus/reservations/ext_reservation.c b/litmus/reservations/ext_reservation.c
index a5c3b37a745b..3bedb0fbee04 100644
--- a/litmus/reservations/ext_reservation.c
+++ b/litmus/reservations/ext_reservation.c
@@ -1,10 +1,11 @@
-#include <linux/slab.h>
+#include <linux/mm.h>
+#include <litmus/litmus.h>
 #include <litmus/bheap.h>
+#include <litmus/rt_domain.h>
 #include <litmus/reservations/ext_reservation.h>
 
-/* allocated in litmus.c */
-extern struct kmem_cache* bheap_node_cache;
-extern struct kmem_cache* release_heap_cache;
+struct release_heap* release_heap_alloc(int gfp_flags);
+void release_heap_free(struct release_heap* rh);
 
 int higher_res_prio(struct reservation* first,
                     struct reservation* second)
@@ -40,8 +41,8 @@ void init_ext_reservation(
 {
         res->id = id;
         res->ops = ops;
-        res->heap_node = kmem_cache_alloc(bheap_node_cache, GFP_ATOMIC);
-        res->rel_heap = kmem_cache_alloc(release_heap_cache, GFP_ATOMIC);
+        res->heap_node = bheap_node_alloc(GFP_ATOMIC);
+        res->rel_heap = release_heap_alloc(GFP_ATOMIC);
         bheap_node_init(&res->heap_node, res);
         INIT_LIST_HEAD(&res->ln);
         INIT_LIST_HEAD(&res->all_list);
@@ -49,6 +50,6 @@ void init_ext_reservation(
 
 void clean_up_ext_reservation(struct reservation* res)
 {
-        kmem_cache_free(bheap_node_cache, res->heap_node);
-        kmem_cache_free(release_heap_cache, res->rel_heap);
+        bheap_node_free(res->heap_node);
+        release_heap_free(res->rel_heap);
 }
diff --git a/litmus/reservations/gedf_reservation.c b/litmus/reservations/gedf_reservation.c
index 7b8162692903..771971d0af1b 100644
--- a/litmus/reservations/gedf_reservation.c
+++ b/litmus/reservations/gedf_reservation.c
@@ -700,7 +700,7 @@ static void gedf_env_release_jobs(rt_domain_t* rt, struct bheap* res)
                 = container_of(rt, struct gedf_reservation_environment, domain);
 
         raw_spin_lock_irqsave(&rt->ready_lock, flags);
-        __merge_ready_res(rt, res);
+        __merge_ready(rt, res);
         check_for_preemptions(gedf_env);
         raw_spin_unlock_irqrestore(&rt->ready_lock, flags);
 }
diff --git a/litmus/reservations/table_driven_ext_reservation.c b/litmus/reservations/table_driven_ext_reservation.c
index 1170719c2e83..db9e38195248 100644
--- a/litmus/reservations/table_driven_ext_reservation.c
+++ b/litmus/reservations/table_driven_ext_reservation.c
@@ -411,7 +411,7 @@ static void mtd_env_release_jobs(rt_domain_t* rt, struct bheap* res)
         unsigned long flags;
 
         raw_spin_lock_irqsave(&rt->ready_lock, flags);
-        __merge_ready_res(rt, res);
+        __merge_ready(rt, res);
         litmus_reschedule_local();
         raw_spin_unlock_irqrestore(&rt->ready_lock, flags);
 }
diff --git a/litmus/rt_domain.c b/litmus/rt_domain.c
index db3a48bff0d0..80e01719884e 100644
--- a/litmus/rt_domain.c
+++ b/litmus/rt_domain.c
@@ -53,7 +53,7 @@ static void default_release_jobs(rt_domain_t* rt, struct bheap* tasks)
 
 static unsigned int time2slot(lt_t time)
 {
-                return (unsigned int) time2quanta(time, FLOOR) % RELEASE_QUEUE_SLOTS;
+        return (unsigned int) time2quanta(time, FLOOR) % RELEASE_QUEUE_SLOTS;
 }
 
 int release_order(struct binheap_node *a, struct binheap_node *b)
@@ -503,15 +503,10 @@ void __merge_ready(rt_domain_t* rt, struct bheap* tasks)
         rt->check_resched(rt);
 }
 
-void __merge_ready_res(rt_domain_t* rt, struct bheap* res)
-{
-        bheap_union(rt->order, &rt->ready_queue, res);
-        rt->check_resched(rt);
-}
 
 #ifdef CONFIG_RELEASE_MASTER
 void __add_release_on(rt_domain_t* rt, struct task_struct *task,
-                          int target_cpu)
+                      int target_cpu)
 {
         TRACE_TASK(task, "add_release_on(), rel=%llu, target=%d\n",
                    get_release(task), target_cpu);
@@ -548,10 +543,3 @@ void __add_release_res(rt_domain_t* rt, struct reservation *res)
 
         arm_release_timer_res(rt, 1);
 }
-
-void __add_release_res_no_timer(rt_domain_t* rt, struct reservation* res)
-{
-        list_add(&res->ln, &rt->tobe_released);
-
-        arm_release_timer_res(rt, 0);
-}