aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrea Bastoni <bastoni@cs.unc.edu>2010-06-12 20:22:16 -0400
committerAndrea Bastoni <bastoni@cs.unc.edu>2010-06-12 20:22:16 -0400
commitd1aa1956eb23202e4d614574f686e53b8785212c (patch)
tree3927c01425c698132090cc7d3dd60ece03dc3c94
parent9840983a4f30145bcf0b82b6e2bc8518e7212fb5 (diff)
Bugfix: change __ARCH_HAS_SEND_PULL_TIMERS in CONFIG_ARCH_HAS_SEND_PULL_TIMERS
Commit "0c527966 Make release master support optional" uses __ARCH_HAS_SEND_PULL_TIMERS instead of CONFIG_ARCH_HAS_SEND_PULL_TIMERS (introduced in commit 0fb33c99) to conditionally compile a pull timer related code in rt_domain.c. This code is disabled and pull-timer's state is no longer properly reset. Therefore, a pulled timer cannot be armed anymore.
-rw-r--r--litmus/rt_domain.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/litmus/rt_domain.c b/litmus/rt_domain.c
index 26f1cc48f865..b5de181e62db 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 __ARCH_HAS_SEND_PULL_TIMERS 161#ifdef CONFIG_ARCH_HAS_SEND_PULL_TIMERS
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}