Debug commit.

Some things are working, but the kernel panics when you try and
deallocate an event group.

Committed so Jonathan can look at it.

1 files changed, 8 insertions, 2 deletions

diff --git a/litmus/rt_domain.c b/litmus/rt_domain.c
index fbd91c82961..ffb3cab9cff 100644
--- a/litmus/rt_domain.c
+++ b/litmus/rt_domain.c
@@ -100,12 +100,18 @@ struct release_heap* release_heap_alloc(int gfp_flags)
         return rh;
 }
 
+#ifdef CONFIG_MERGE_TIMERS
+extern struct kmem_cache *event_list_cache;
+#endif
+
 void release_heap_free(struct release_heap* rh)
 {
         /* make sure timer is no longer in use */
 #ifdef CONFIG_MERGE_TIMERS
-        /* if (rh->dom) */
-        /*      cancel_event(&rh->event); */
+        if (rh->dom) {
+                cancel_event(&rh->event);
+                kmem_cache_free(event_list_cache, rh->event.event_list);
+        }
 #else
         hrtimer_cancel(&rh->timer);
 #endif