redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

sched: Remove unused 'this_best_prio arg' from balance_tasks()

Browse source 
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>
This commit is contained in:
Vladimir Davydov 2011-05-03 22:31:07 +04:00 committed by Ingo Molnar
parent 1437f5bca3
commit 931aeeda0d
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
kernel/sched_fair.c
View file

@ -2142,7 +2142,7 @@ static unsigned long
balance_tasks(struct rq *this_rq, int this_cpu, struct rq *busiest, balance_tasks(struct rq *this_rq, int this_cpu, struct rq *busiest,
unsigned long max_load_move, struct sched_domain *sd, unsigned long max_load_move, struct sched_domain *sd,
enum cpu_idle_type idle, int *all_pinned, enum cpu_idle_type idle, int *all_pinned,
int *this_best_prio, struct cfs_rq *busiest_cfs_rq) struct cfs_rq *busiest_cfs_rq)
{ {
int loops = 0, pulled = 0; int loops = 0, pulled = 0;
long rem_load_move = max_load_move; long rem_load_move = max_load_move;
@ -2180,9 +2180,6 @@ balance_tasks(struct rq *this_rq, int this_cpu, struct rq *busiest,
*/ */
if (rem_load_move <= 0) if (rem_load_move <= 0)
break; break;
if (p->prio < *this_best_prio)
*this_best_prio = p->prio;
} }
out: out:
/* /*
@ -2242,7 +2239,7 @@ static unsigned long
load_balance_fair(struct rq *this_rq, int this_cpu, struct rq *busiest, load_balance_fair(struct rq *this_rq, int this_cpu, struct rq *busiest,
unsigned long max_load_move, unsigned long max_load_move,
struct sched_domain *sd, enum cpu_idle_type idle, struct sched_domain *sd, enum cpu_idle_type idle,
int *all_pinned, int *this_best_prio) int *all_pinned)
{ {
long rem_load_move = max_load_move; long rem_load_move = max_load_move;
int busiest_cpu = cpu_of(busiest); int busiest_cpu = cpu_of(busiest);
@ -2267,7 +2264,7 @@ load_balance_fair(struct rq *this_rq, int this_cpu, struct rq *busiest,
rem_load = div_u64(rem_load, busiest_h_load + 1); rem_load = div_u64(rem_load, busiest_h_load + 1);
moved_load = balance_tasks(this_rq, this_cpu, busiest, moved_load = balance_tasks(this_rq, this_cpu, busiest,
rem_load, sd, idle, all_pinned, this_best_prio, rem_load, sd, idle, all_pinned,
busiest_cfs_rq); busiest_cfs_rq);
if (!moved_load) if (!moved_load)
@ -2293,11 +2290,11 @@ static unsigned long
load_balance_fair(struct rq *this_rq, int this_cpu, struct rq *busiest, load_balance_fair(struct rq *this_rq, int this_cpu, struct rq *busiest,
unsigned long max_load_move, unsigned long max_load_move,
struct sched_domain *sd, enum cpu_idle_type idle, struct sched_domain *sd, enum cpu_idle_type idle,
int *all_pinned, int *this_best_prio) int *all_pinned)
{ {
return balance_tasks(this_rq, this_cpu, busiest, return balance_tasks(this_rq, this_cpu, busiest,
max_load_move, sd, idle, all_pinned, max_load_move, sd, idle, all_pinned,
this_best_prio, &busiest->cfs); &busiest->cfs);
} }
#endif #endif
@ -2314,12 +2311,11 @@ static int move_tasks(struct rq *this_rq, int this_cpu, struct rq *busiest,
int *all_pinned) int *all_pinned)
{ {
unsigned long total_load_moved = 0, load_moved; unsigned long total_load_moved = 0, load_moved;
int this_best_prio = this_rq->curr->prio;
do { do {
load_moved = load_balance_fair(this_rq, this_cpu, busiest, load_moved = load_balance_fair(this_rq, this_cpu, busiest,
max_load_move - total_load_moved, max_load_move - total_load_moved,
sd, idle, all_pinned, &this_best_prio); sd, idle, all_pinned);
total_load_moved += load_moved; total_load_moved += load_moved;