diff options
author | Glenn Elliott <gelliott@cs.unc.edu> | 2014-02-19 14:35:13 -0500 |
---|---|---|
committer | Glenn Elliott <gelliott@cs.unc.edu> | 2014-02-19 14:35:13 -0500 |
commit | 94b8c497a824e169bc23cd2138464739aaf0a381 (patch) | |
tree | 0fb67ef6f41fea83e90a2a8f1a28407b4fd4e027 | |
parent | 0bc71e43862cc3998c7540a7ec5372a16b0bd0e0 (diff) |
cleanup
-rw-r--r-- | litmus/sched_cfl_split.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/litmus/sched_cfl_split.c b/litmus/sched_cfl_split.c index 6fd1591aec5a..71c177d24150 100644 --- a/litmus/sched_cfl_split.c +++ b/litmus/sched_cfl_split.c | |||
@@ -176,7 +176,7 @@ static enum hrtimer_restart on_split_timeout(struct hrtimer *timer) | |||
176 | cpu_entry_t* st = container_of(timer, | 176 | cpu_entry_t* st = container_of(timer, |
177 | cpu_entry_t, | 177 | cpu_entry_t, |
178 | split_timer); | 178 | split_timer); |
179 | 179 | ||
180 | unsigned long flags; | 180 | unsigned long flags; |
181 | 181 | ||
182 | local_irq_save(flags); | 182 | local_irq_save(flags); |
@@ -198,7 +198,7 @@ static void cancel_split_timer(cpu_entry_t* ce) | |||
198 | /* Since interrupts are disabled and et->timer_armed is only | 198 | /* Since interrupts are disabled and et->timer_armed is only |
199 | * modified locally, we do not need any locks. | 199 | * modified locally, we do not need any locks. |
200 | */ | 200 | */ |
201 | 201 | ||
202 | if (ce->timer_armed) { | 202 | if (ce->timer_armed) { |
203 | ret = hrtimer_try_to_cancel(&ce->split_timer); | 203 | ret = hrtimer_try_to_cancel(&ce->split_timer); |
204 | /* Should never be inactive. */ | 204 | /* Should never be inactive. */ |
@@ -220,7 +220,7 @@ static void arm_split_timer(cpu_entry_t *ce, | |||
220 | 220 | ||
221 | /* __hrtimer_start_range_ns() cancels the timer | 221 | /* __hrtimer_start_range_ns() cancels the timer |
222 | * anyway, so we don't have to check whether it is still armed */ | 222 | * anyway, so we don't have to check whether it is still armed */ |
223 | 223 | ||
224 | /*We won't do any new deadline moves if the budget has been exhausted*/ | 224 | /*We won't do any new deadline moves if the budget has been exhausted*/ |
225 | if (likely(!is_np(t) && (time_to_move = time_to_next_move(t)))) { | 225 | if (likely(!is_np(t) && (time_to_move = time_to_next_move(t)))) { |
226 | when_to_fire = now + time_to_move; | 226 | when_to_fire = now + time_to_move; |