diff options
author | Daniel Lezcano <daniel.lezcano@linaro.org> | 2014-01-17 04:04:01 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-02-10 10:17:01 -0500 |
commit | b4f2ab43615e5b36c48fffa99f26aca381839ac6 (patch) | |
tree | 1a26d67fc0357fd18c30ea773148ee32ca76c4cd | |
parent | d0ea026808ad81de2af14938448419a95211b938 (diff) |
sched: Remove 'cpu' parameter from idle_balance()
The cpu parameter passed to idle_balance() is not needed as it could
be retrieved from 'struct rq.'
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: alex.shi@linaro.org
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1389949444-14821-1-git-send-email-daniel.lezcano@linaro.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r-- | kernel/sched/core.c | 2 | ||||
-rw-r--r-- | kernel/sched/fair.c | 3 | ||||
-rw-r--r-- | kernel/sched/sched.h | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 104c8164e04f..74dd565c2e1b 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c | |||
@@ -2705,7 +2705,7 @@ need_resched: | |||
2705 | pre_schedule(rq, prev); | 2705 | pre_schedule(rq, prev); |
2706 | 2706 | ||
2707 | if (unlikely(!rq->nr_running)) | 2707 | if (unlikely(!rq->nr_running)) |
2708 | idle_balance(cpu, rq); | 2708 | idle_balance(rq); |
2709 | 2709 | ||
2710 | put_prev_task(rq, prev); | 2710 | put_prev_task(rq, prev); |
2711 | next = pick_next_task(rq); | 2711 | next = pick_next_task(rq); |
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 4caa8030824d..428bc9d2c383 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c | |||
@@ -6531,12 +6531,13 @@ out: | |||
6531 | * idle_balance is called by schedule() if this_cpu is about to become | 6531 | * idle_balance is called by schedule() if this_cpu is about to become |
6532 | * idle. Attempts to pull tasks from other CPUs. | 6532 | * idle. Attempts to pull tasks from other CPUs. |
6533 | */ | 6533 | */ |
6534 | void idle_balance(int this_cpu, struct rq *this_rq) | 6534 | void idle_balance(struct rq *this_rq) |
6535 | { | 6535 | { |
6536 | struct sched_domain *sd; | 6536 | struct sched_domain *sd; |
6537 | int pulled_task = 0; | 6537 | int pulled_task = 0; |
6538 | unsigned long next_balance = jiffies + HZ; | 6538 | unsigned long next_balance = jiffies + HZ; |
6539 | u64 curr_cost = 0; | 6539 | u64 curr_cost = 0; |
6540 | int this_cpu = this_rq->cpu; | ||
6540 | 6541 | ||
6541 | this_rq->idle_stamp = rq_clock(this_rq); | 6542 | this_rq->idle_stamp = rq_clock(this_rq); |
6542 | 6543 | ||
diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index b44720d38ae9..82c0e02f2a58 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h | |||
@@ -1158,7 +1158,7 @@ extern const struct sched_class idle_sched_class; | |||
1158 | extern void update_group_power(struct sched_domain *sd, int cpu); | 1158 | extern void update_group_power(struct sched_domain *sd, int cpu); |
1159 | 1159 | ||
1160 | extern void trigger_load_balance(struct rq *rq); | 1160 | extern void trigger_load_balance(struct rq *rq); |
1161 | extern void idle_balance(int this_cpu, struct rq *this_rq); | 1161 | extern void idle_balance(struct rq *this_rq); |
1162 | 1162 | ||
1163 | extern void idle_enter_fair(struct rq *this_rq); | 1163 | extern void idle_enter_fair(struct rq *this_rq); |
1164 | extern void idle_exit_fair(struct rq *this_rq); | 1164 | extern void idle_exit_fair(struct rq *this_rq); |