diff options
| author | Jonathan Herman <hermanjl@cs.unc.edu> | 2012-09-29 13:05:45 -0400 |
|---|---|---|
| committer | Jonathan Herman <hermanjl@cs.unc.edu> | 2012-09-29 13:05:45 -0400 |
| commit | e9fc09f4bd2bae682cea6e7155aad1fe3f58e77b (patch) | |
| tree | 469975dd524354db3b36d51704f77ce728fc0189 /litmus/rt_domain.c | |
| parent | daf1e620bff2cb6d830ef66725369bba9c858f62 (diff) | |
Resolved merge bugs.
Diffstat (limited to 'litmus/rt_domain.c')
| -rw-r--r-- | litmus/rt_domain.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/litmus/rt_domain.c b/litmus/rt_domain.c index 79243f92edb..faf876623d6 100644 --- a/litmus/rt_domain.c +++ b/litmus/rt_domain.c | |||
| @@ -57,8 +57,6 @@ static void do_release(struct release_heap *rh) | |||
| 57 | TS_LVLB_RELEASE_START; | 57 | TS_LVLB_RELEASE_START; |
| 58 | else | 58 | else |
| 59 | TS_LVLC_RELEASE_START; | 59 | TS_LVLC_RELEASE_START; |
| 60 | struct release_heap* rh; | ||
| 61 | rh = container_of(timer, struct release_heap, timer); | ||
| 62 | 60 | ||
| 63 | TS_RELEASE_LATENCY(rh->release_time); | 61 | TS_RELEASE_LATENCY(rh->release_time); |
| 64 | 62 | ||