aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/sched_fair.c
diff options
context:
space:
mode:
authorVladimir Davydov <vdavydov@parallels.com>2011-05-03 14:31:07 -0400
committerIngo Molnar <mingo@elte.hu>2011-05-04 03:07:21 -0400
commit931aeeda0dca81152aec48f30be01e86a268bf89 (patch)
tree7314d932c1ad6f00285ae35fe82d0872b637483e /kernel/sched_fair.c
parent1437f5bca3c2d162f058cba37dfbeb20f619040d (diff)
sched: Remove unused 'this_best_prio arg' from balance_tasks()
It's passed across multiple functions but is never really used, so remove it. Signed-off-by: Vladimir Davydov <vdavydov@parallels.com> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/r/1304447467-29200-1-git-send-email-vdavydov@parallels.com Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/sched_fair.c')
-rw-r--r--kernel/sched_fair.c16
1 files changed, 6 insertions, 10 deletions
diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index 5280272cce3e..37f22626225e 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -2142,7 +2142,7 @@ static unsigned long
2142balance_tasks(struct rq *this_rq, int this_cpu, struct rq *busiest, 2142balance_tasks(struct rq *this_rq, int this_cpu, struct rq *busiest,
2143 unsigned long max_load_move, struct sched_domain *sd, 2143 unsigned long max_load_move, struct sched_domain *sd,
2144 enum cpu_idle_type idle, int *all_pinned, 2144 enum cpu_idle_type idle, int *all_pinned,
2145 int *this_best_prio, struct cfs_rq *busiest_cfs_rq) 2145 struct cfs_rq *busiest_cfs_rq)
2146{ 2146{
2147 int loops = 0, pulled = 0; 2147 int loops = 0, pulled = 0;
2148 long rem_load_move = max_load_move; 2148 long rem_load_move = max_load_move;
@@ -2180,9 +2180,6 @@ balance_tasks(struct rq *this_rq, int this_cpu, struct rq *busiest,
2180 */ 2180 */
2181 if (rem_load_move <= 0) 2181 if (rem_load_move <= 0)
2182 break; 2182 break;
2183
2184 if (p->prio < *this_best_prio)
2185 *this_best_prio = p->prio;
2186 } 2183 }
2187out: 2184out:
2188 /* 2185 /*
@@ -2242,7 +2239,7 @@ static unsigned long
2242load_balance_fair(struct rq *this_rq, int this_cpu, struct rq *busiest, 2239load_balance_fair(struct rq *this_rq, int this_cpu, struct rq *busiest,
2243 unsigned long max_load_move, 2240 unsigned long max_load_move,
2244 struct sched_domain *sd, enum cpu_idle_type idle, 2241 struct sched_domain *sd, enum cpu_idle_type idle,
2245 int *all_pinned, int *this_best_prio) 2242 int *all_pinned)
2246{ 2243{
2247 long rem_load_move = max_load_move; 2244 long rem_load_move = max_load_move;
2248 int busiest_cpu = cpu_of(busiest); 2245 int busiest_cpu = cpu_of(busiest);
@@ -2267,7 +2264,7 @@ load_balance_fair(struct rq *this_rq, int this_cpu, struct rq *busiest,
2267 rem_load = div_u64(rem_load, busiest_h_load + 1); 2264 rem_load = div_u64(rem_load, busiest_h_load + 1);
2268 2265
2269 moved_load = balance_tasks(this_rq, this_cpu, busiest, 2266 moved_load = balance_tasks(this_rq, this_cpu, busiest,
2270 rem_load, sd, idle, all_pinned, this_best_prio, 2267 rem_load, sd, idle, all_pinned,
2271 busiest_cfs_rq); 2268 busiest_cfs_rq);
2272 2269
2273 if (!moved_load) 2270 if (!moved_load)
@@ -2293,11 +2290,11 @@ static unsigned long
2293load_balance_fair(struct rq *this_rq, int this_cpu, struct rq *busiest, 2290load_balance_fair(struct rq *this_rq, int this_cpu, struct rq *busiest,
2294 unsigned long max_load_move, 2291 unsigned long max_load_move,
2295 struct sched_domain *sd, enum cpu_idle_type idle, 2292 struct sched_domain *sd, enum cpu_idle_type idle,
2296 int *all_pinned, int *this_best_prio) 2293 int *all_pinned)
2297{ 2294{
2298 return balance_tasks(this_rq, this_cpu, busiest, 2295 return balance_tasks(this_rq, this_cpu, busiest,
2299 max_load_move, sd, idle, all_pinned, 2296 max_load_move, sd, idle, all_pinned,
2300 this_best_prio, &busiest->cfs); 2297 &busiest->cfs);
2301} 2298}
2302#endif 2299#endif
2303 2300
@@ -2314,12 +2311,11 @@ static int move_tasks(struct rq *this_rq, int this_cpu, struct rq *busiest,
2314 int *all_pinned) 2311 int *all_pinned)
2315{ 2312{
2316 unsigned long total_load_moved = 0, load_moved; 2313 unsigned long total_load_moved = 0, load_moved;
2317 int this_best_prio = this_rq->curr->prio;
2318 2314
2319 do { 2315 do {
2320 load_moved = load_balance_fair(this_rq, this_cpu, busiest, 2316 load_moved = load_balance_fair(this_rq, this_cpu, busiest,
2321 max_load_move - total_load_moved, 2317 max_load_move - total_load_moved,
2322 sd, idle, all_pinned, &this_best_prio); 2318 sd, idle, all_pinned);
2323 2319
2324 total_load_moved += load_moved; 2320 total_load_moved += load_moved;
2325 2321