1 files changed, 2 insertions, 7 deletions

diff --git a/litmus/litmus.c b/litmus/litmus.c
index 6a75da08f0fb..c4f899510900 100644
--- a/litmus/litmus.c
+++ b/litmus/litmus.c
@@ -16,6 +16,7 @@
 #include <litmus/rt_domain.h>
 #include <litmus/litmus_proc.h>
 #include <litmus/sched_trace.h>
+#include <litmus/servers.h>
 
 /* Number of RT tasks that exist in the system */
 atomic_t rt_task_count          = ATOMIC_INIT(0);
@@ -33,7 +34,6 @@ atomic_t release_master_cpu = ATOMIC_INIT(NO_CPU);
 
 static struct kmem_cache * bheap_node_cache;
 extern struct kmem_cache * release_heap_cache;
-extern struct kmem_cache * server_release_cache;
 
 struct bheap_node* bheap_node_alloc(int gfp_flags)
 {
@@ -327,8 +327,6 @@ long litmus_admit_task(struct task_struct* tsk)
         }
 
         INIT_LIST_HEAD(&tsk_rt(tsk)->list);
-        INIT_LIST_HEAD(&tsk_rt(tsk)->slack_list);
-        tsk_rt(tsk)->slack_server = NULL;
 
         /* avoid scheduler plugin changing underneath us */
         raw_spin_lock_irqsave(&task_transition_lock, flags);
@@ -336,7 +334,6 @@ long litmus_admit_task(struct task_struct* tsk)
         /* allocate heap node for this task */
         tsk_rt(tsk)->heap_node = bheap_node_alloc(GFP_ATOMIC);
         tsk_rt(tsk)->rel_heap = release_heap_alloc(GFP_ATOMIC);
-        tsk_rt(tsk)->slack_candidate = 0;
 
         if (!tsk_rt(tsk)->heap_node || !tsk_rt(tsk)->rel_heap) {
                 printk(KERN_WARNING "litmus: no more heap node memory!?\n");
@@ -523,9 +520,8 @@ static int __init _init_litmus(void)
 
         register_sched_plugin(&linux_sched_plugin);
 
-        bheap_node_cache    = KMEM_CACHE(bheap_node, SLAB_PANIC);
+        bheap_node_cache = KMEM_CACHE(bheap_node, SLAB_PANIC);
         release_heap_cache = KMEM_CACHE(release_heap, SLAB_PANIC);
-        server_release_cache = KMEM_CACHE(release_heap, SLAB_PANIC);
 
 #ifdef CONFIG_MAGIC_SYSRQ
         /* offer some debugging help */
@@ -545,7 +541,6 @@ static void _exit_litmus(void)
         exit_litmus_proc();
         kmem_cache_destroy(bheap_node_cache);
         kmem_cache_destroy(release_heap_cache);
-        kmem_cache_destroy(server_release_cache);
 }
 
 module_init(_init_litmus);