3 files changed, 21 insertions, 7 deletions

diff --git a/include/litmus/litmus.h b/include/litmus/litmus.h
index f0d42b729126..2e9e292d2822 100644
--- a/include/litmus/litmus.h
+++ b/include/litmus/litmus.h
@@ -60,7 +60,7 @@ void litmus_exec(void);
 void exit_litmus(struct task_struct *dead_tsk);
 
 long litmus_admit_task(struct task_struct *tsk);
-void litmus_exit_task(struct task_struct *tsk);
+void litmus_exit_task(struct task_struct *tsk, int free_mem);
 
 #define is_realtime(t)          ((t)->policy == SCHED_LITMUS)
 #define rt_transition_pending(t) \
diff --git a/kernel/sched.c b/kernel/sched.c
index 0166daa4a374..5969c8b25689 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -905,7 +905,7 @@ static __read_mostly int scheduler_running;
  *
  * Litmus RT: with the Preempt-RT patch we rely on rt-threads
  * to set timers. If the RT throttling gets activated we experience
- * very long latencies. Change from 950000 to -1 -> RUNTIME_INF 
+ * very long latencies. Change from 950000 to -1 -> RUNTIME_INF
  */
 int sysctl_sched_rt_runtime = -1;
 
@@ -6805,7 +6805,7 @@ recheck:
         p->sched_reset_on_fork = reset_on_fork;
 
         if (p->policy == SCHED_LITMUS)
-                litmus_exit_task(p);
+                litmus_exit_task(p, 0);
 
         oldprio = p->prio;
         prev_class = p->sched_class;
diff --git a/litmus/litmus.c b/litmus/litmus.c
index 447f8e8af04d..fc63e6dee84a 100644
--- a/litmus/litmus.c
+++ b/litmus/litmus.c
@@ -386,7 +386,7 @@ out:
         return retval;
 }
 
-void litmus_exit_task(struct task_struct* tsk)
+void litmus_exit_task(struct task_struct* tsk, int free_mem)
 {
         if (is_realtime(tsk)) {
                 sched_trace_task_completion(tsk, 1);
@@ -394,8 +394,22 @@ void litmus_exit_task(struct task_struct* tsk)
                 litmus->task_exit(tsk);
 
                 BUG_ON(bheap_node_in_heap(tsk_rt(tsk)->heap_node));
-                bheap_node_free(tsk_rt(tsk)->heap_node);
-                release_heap_free(tsk_rt(tsk)->rel_heap);
+                if (free_mem) {
+                        bheap_node_free(tsk_rt(tsk)->heap_node);
+                        release_heap_free(tsk_rt(tsk)->rel_heap);
+                } else {
+                        /* XXX: in PreemptRT calling kfree here will deadlock
+                         * postponing the free when the rq->lock and the
+                         * pi_lock are released don't work (it breaks
+                         * other assumptions in the code). This is ugly,
+                         * but for now we leak memory. To avoid the leakage
+                         * the user should not reset the state of a litmus
+                         * task to a background task.
+                         */
+                        tsk_rt(tsk)->heap_node = NULL;
+                        hrtimer_cancel(&(tsk_rt(tsk)->rel_heap)->timer);
+                        tsk_rt(tsk)->rel_heap = NULL;
+                }
 
                 atomic_dec(&rt_task_count);
                 reinit_litmus_state(tsk, 1);
@@ -500,7 +514,7 @@ void exit_litmus(struct task_struct *dead_tsk)
 
         /* main cleanup only for RT tasks */
         if (is_realtime(dead_tsk))
-                litmus_exit_task(dead_tsk);
+                litmus_exit_task(dead_tsk, 1);
 }