aboutsummaryrefslogtreecommitdiffstats
path: root/litmus/rt_domain.c
diff options
context:
space:
mode:
authorGlenn Elliott <gelliott@cs.unc.edu>2012-03-04 19:47:13 -0500
committerGlenn Elliott <gelliott@cs.unc.edu>2012-03-04 19:47:13 -0500
commitc71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch)
treeecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /litmus/rt_domain.c
parentea53c912f8a86a8567697115b6a0d8152beee5c8 (diff)
parent6a00f206debf8a5c8899055726ad127dbeeed098 (diff)
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts: litmus/sched_cedf.c
Diffstat (limited to 'litmus/rt_domain.c')
-rw-r--r--litmus/rt_domain.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/litmus/rt_domain.c b/litmus/rt_domain.c
index 81a5ac16f164..d405854cd39c 100644
--- a/litmus/rt_domain.c
+++ b/litmus/rt_domain.c
@@ -55,12 +55,14 @@ static enum hrtimer_restart on_release_timer(struct hrtimer *timer)
55{ 55{
56 unsigned long flags; 56 unsigned long flags;
57 struct release_heap* rh; 57 struct release_heap* rh;
58 rh = container_of(timer, struct release_heap, timer);
59
60 TS_RELEASE_LATENCY(rh->release_time);
58 61
59 VTRACE("on_release_timer(0x%p) starts.\n", timer); 62 VTRACE("on_release_timer(0x%p) starts.\n", timer);
60 63
61 TS_RELEASE_START; 64 TS_RELEASE_START;
62 65
63 rh = container_of(timer, struct release_heap, timer);
64 66
65 raw_spin_lock_irqsave(&rh->dom->release_lock, flags); 67 raw_spin_lock_irqsave(&rh->dom->release_lock, flags);
66 VTRACE("CB has the release_lock 0x%p\n", &rh->dom->release_lock); 68 VTRACE("CB has the release_lock 0x%p\n", &rh->dom->release_lock);