diff options
author | Daniel Lezcano <daniel.lezcano@linaro.org> | 2014-01-06 06:34:43 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-01-13 07:47:31 -0500 |
commit | f7ed0a895ead0f093f59898ff9cf4e20768a5f09 (patch) | |
tree | 582f7fd2a8f96e9d9c93a2f799262d6afec6887d /kernel/sched | |
parent | 0aeeeebac8d8304501680f12862784341f4bee7b (diff) |
sched: Pass 'struct rq' to rebalance_domains()
The cpu information is stored in the struct rq and the caller of the
rebalance_domains function pass the cpu to retrieve the struct rq but
it already has the struct rq info. Replace the cpu parameter with the
struct rq.
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1389008085-9069-7-git-send-email-daniel.lezcano@linaro.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/sched')
-rw-r--r-- | kernel/sched/fair.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index b91cd93a32a3..ff4e0dfaecc6 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c | |||
@@ -6640,10 +6640,10 @@ void update_max_interval(void) | |||
6640 | * | 6640 | * |
6641 | * Balancing parameters are set up in init_sched_domains. | 6641 | * Balancing parameters are set up in init_sched_domains. |
6642 | */ | 6642 | */ |
6643 | static void rebalance_domains(int cpu, enum cpu_idle_type idle) | 6643 | static void rebalance_domains(struct rq *rq, enum cpu_idle_type idle) |
6644 | { | 6644 | { |
6645 | int continue_balancing = 1; | 6645 | int continue_balancing = 1; |
6646 | struct rq *rq = cpu_rq(cpu); | 6646 | int cpu = rq->cpu; |
6647 | unsigned long interval; | 6647 | unsigned long interval; |
6648 | struct sched_domain *sd; | 6648 | struct sched_domain *sd; |
6649 | /* Earliest time when we have to do rebalance again */ | 6649 | /* Earliest time when we have to do rebalance again */ |
@@ -6769,7 +6769,7 @@ static void nohz_idle_balance(int this_cpu, enum cpu_idle_type idle) | |||
6769 | update_idle_cpu_load(rq); | 6769 | update_idle_cpu_load(rq); |
6770 | raw_spin_unlock_irq(&rq->lock); | 6770 | raw_spin_unlock_irq(&rq->lock); |
6771 | 6771 | ||
6772 | rebalance_domains(balance_cpu, CPU_IDLE); | 6772 | rebalance_domains(rq, CPU_IDLE); |
6773 | 6773 | ||
6774 | if (time_after(this_rq->next_balance, rq->next_balance)) | 6774 | if (time_after(this_rq->next_balance, rq->next_balance)) |
6775 | this_rq->next_balance = rq->next_balance; | 6775 | this_rq->next_balance = rq->next_balance; |
@@ -6858,7 +6858,7 @@ static void run_rebalance_domains(struct softirq_action *h) | |||
6858 | enum cpu_idle_type idle = this_rq->idle_balance ? | 6858 | enum cpu_idle_type idle = this_rq->idle_balance ? |
6859 | CPU_IDLE : CPU_NOT_IDLE; | 6859 | CPU_IDLE : CPU_NOT_IDLE; |
6860 | 6860 | ||
6861 | rebalance_domains(this_cpu, idle); | 6861 | rebalance_domains(this_rq, idle); |
6862 | 6862 | ||
6863 | /* | 6863 | /* |
6864 | * If this cpu has a pending nohz_balance_kick, then do the | 6864 | * If this cpu has a pending nohz_balance_kick, then do the |