diff options
author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-06-19 13:45:36 -0400 |
---|---|---|
committer | Bjoern B. Brandenburg <bbb@cs.unc.edu> | 2010-07-16 10:36:52 -0400 |
commit | cbc5d49e4973400737aab50b60dc5d86e71f5420 (patch) | |
tree | e2c212e6566a7e1ee209c6e560192fe90561787b | |
parent | d1aa1956eb23202e4d614574f686e53b8785212c (diff) |
Bugfix: avoid conditional compilation dependent error
If RELEASE_MASTER is not selected the "info" hrtimer_start_on_info
structure in release_heap structure is not visible and trying to access
"info" from reinit_release_heap() causes the following error:
error: 'struct release_heap' has no member named 'info'
info should not be referenced if RELEASE_MASTER is not used.
The problem was first reported by Glenn <gelliott@cs.unc.edu>
-rw-r--r-- | litmus/rt_domain.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/litmus/rt_domain.c b/litmus/rt_domain.c index b5de181e62db..8a3ff706c208 100644 --- a/litmus/rt_domain.c +++ b/litmus/rt_domain.c | |||
@@ -158,7 +158,7 @@ static void reinit_release_heap(struct task_struct* t) | |||
158 | 158 | ||
159 | /* initialize */ | 159 | /* initialize */ |
160 | bheap_init(&rh->heap); | 160 | bheap_init(&rh->heap); |
161 | #ifdef CONFIG_ARCH_HAS_SEND_PULL_TIMERS | 161 | #ifdef CONFIG_RELEASE_MASTER |
162 | atomic_set(&rh->info.state, HRTIMER_START_ON_INACTIVE); | 162 | atomic_set(&rh->info.state, HRTIMER_START_ON_INACTIVE); |
163 | #endif | 163 | #endif |
164 | } | 164 | } |