diff options
Diffstat (limited to 'kernel/sched_rt.c')
-rw-r--r-- | kernel/sched_rt.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/kernel/sched_rt.c b/kernel/sched_rt.c index 002fcf8d3f64..2b0626a43cb8 100644 --- a/kernel/sched_rt.c +++ b/kernel/sched_rt.c | |||
@@ -172,15 +172,16 @@ static struct task_struct *load_balance_next_rt(void *arg) | |||
172 | return p; | 172 | return p; |
173 | } | 173 | } |
174 | 174 | ||
175 | static int | 175 | static unsigned long |
176 | load_balance_rt(struct rq *this_rq, int this_cpu, struct rq *busiest, | 176 | load_balance_rt(struct rq *this_rq, int this_cpu, struct rq *busiest, |
177 | unsigned long max_nr_move, unsigned long max_load_move, | 177 | unsigned long max_nr_move, unsigned long max_load_move, |
178 | struct sched_domain *sd, enum cpu_idle_type idle, | 178 | struct sched_domain *sd, enum cpu_idle_type idle, |
179 | int *all_pinned, unsigned long *load_moved) | 179 | int *all_pinned) |
180 | { | 180 | { |
181 | int this_best_prio, best_prio, best_prio_seen = 0; | 181 | int this_best_prio, best_prio, best_prio_seen = 0; |
182 | int nr_moved; | 182 | int nr_moved; |
183 | struct rq_iterator rt_rq_iterator; | 183 | struct rq_iterator rt_rq_iterator; |
184 | unsigned long load_moved; | ||
184 | 185 | ||
185 | best_prio = sched_find_first_bit(busiest->rt.active.bitmap); | 186 | best_prio = sched_find_first_bit(busiest->rt.active.bitmap); |
186 | this_best_prio = sched_find_first_bit(this_rq->rt.active.bitmap); | 187 | this_best_prio = sched_find_first_bit(this_rq->rt.active.bitmap); |
@@ -203,11 +204,11 @@ load_balance_rt(struct rq *this_rq, int this_cpu, struct rq *busiest, | |||
203 | rt_rq_iterator.arg = busiest; | 204 | rt_rq_iterator.arg = busiest; |
204 | 205 | ||
205 | nr_moved = balance_tasks(this_rq, this_cpu, busiest, max_nr_move, | 206 | nr_moved = balance_tasks(this_rq, this_cpu, busiest, max_nr_move, |
206 | max_load_move, sd, idle, all_pinned, load_moved, | 207 | max_load_move, sd, idle, all_pinned, &load_moved, |
207 | this_best_prio, best_prio, best_prio_seen, | 208 | this_best_prio, best_prio, best_prio_seen, |
208 | &rt_rq_iterator); | 209 | &rt_rq_iterator); |
209 | 210 | ||
210 | return nr_moved; | 211 | return load_moved; |
211 | } | 212 | } |
212 | 213 | ||
213 | static void task_tick_rt(struct rq *rq, struct task_struct *p) | 214 | static void task_tick_rt(struct rq *rq, struct task_struct *p) |