Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 931aeeda authored by Vladimir Davydov's avatar Vladimir Davydov Committed by Ingo Molnar
Browse files

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: default avatarVladimir 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: default avatarIngo Molnar <mingo@elte.hu>
parent 1437f5bc

kernel/sched_fair.c

+6 −10
Original line number Diff line number Diff line
@@ -2142,7 +2142,7 @@ static unsigned long 
balance_tasks(struct rq *this_rq, int this_cpu, struct rq *busiest,

	      unsigned long max_load_move, struct sched_domain *sd,

	      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;

	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)

			break;



		if (p->prio < *this_best_prio)

			*this_best_prio = p->prio;

	}

out:

	/*
@@ -2242,7 +2239,7 @@ static unsigned long 
load_balance_fair(struct rq *this_rq, int this_cpu, struct rq *busiest,

		  unsigned long max_load_move,

		  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;

	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);



		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);



		if (!moved_load)
@@ -2293,11 +2290,11 @@ static unsigned long 
load_balance_fair(struct rq *this_rq, int this_cpu, struct rq *busiest,

		  unsigned long max_load_move,

		  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,

			max_load_move, sd, idle, all_pinned,

			this_best_prio, &busiest->cfs);

			&busiest->cfs);

}

#endif
@@ -2314,12 +2311,11 @@ static int move_tasks(struct rq *this_rq, int this_cpu, struct rq *busiest, 
		      int *all_pinned)

{

	unsigned long total_load_moved = 0, load_moved;

	int this_best_prio = this_rq->curr->prio;



	do {

		load_moved = load_balance_fair(this_rq, this_cpu, busiest,

				max_load_move - total_load_moved,

				sd, idle, all_pinned, &this_best_prio);

				sd, idle, all_pinned);



		total_load_moved += load_moved;