sched: Pass 'struct rq' to nohz_idle_balance()
The cpu information is stored in the struct rq. Pass the struct rq to nohz_idle_balance, so all the functions called in run_rebalance_domains have the same parameters and the 'this_cpu' variable becomes pointless. Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> [ Added !SMP build fix. ] Signed-off-by: Peter Zijlstra <peterz@infradead.org> Link: http://lkml.kernel.org/r/1389008085-9069-8-git-send-email-daniel.lezcano@linaro.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
parent
f7ed0a895e
commit
208cb16ba3
|
@ -6740,9 +6740,9 @@ out:
|
||||||
* In CONFIG_NO_HZ_COMMON case, the idle balance kickee will do the
|
* In CONFIG_NO_HZ_COMMON case, the idle balance kickee will do the
|
||||||
* rebalancing for all the cpus for whom scheduler ticks are stopped.
|
* rebalancing for all the cpus for whom scheduler ticks are stopped.
|
||||||
*/
|
*/
|
||||||
static void nohz_idle_balance(int this_cpu, enum cpu_idle_type idle)
|
static void nohz_idle_balance(struct rq *this_rq, enum cpu_idle_type idle)
|
||||||
{
|
{
|
||||||
struct rq *this_rq = cpu_rq(this_cpu);
|
int this_cpu = this_rq->cpu;
|
||||||
struct rq *rq;
|
struct rq *rq;
|
||||||
int balance_cpu;
|
int balance_cpu;
|
||||||
|
|
||||||
|
@ -6844,7 +6844,7 @@ need_kick:
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
static void nohz_idle_balance(int this_cpu, enum cpu_idle_type idle) { }
|
static void nohz_idle_balance(struct rq *this_rq, enum cpu_idle_type idle) { }
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -6853,8 +6853,7 @@ static void nohz_idle_balance(int this_cpu, enum cpu_idle_type idle) { }
|
||||||
*/
|
*/
|
||||||
static void run_rebalance_domains(struct softirq_action *h)
|
static void run_rebalance_domains(struct softirq_action *h)
|
||||||
{
|
{
|
||||||
int this_cpu = smp_processor_id();
|
struct rq *this_rq = this_rq();
|
||||||
struct rq *this_rq = cpu_rq(this_cpu);
|
|
||||||
enum cpu_idle_type idle = this_rq->idle_balance ?
|
enum cpu_idle_type idle = this_rq->idle_balance ?
|
||||||
CPU_IDLE : CPU_NOT_IDLE;
|
CPU_IDLE : CPU_NOT_IDLE;
|
||||||
|
|
||||||
|
@ -6865,7 +6864,7 @@ static void run_rebalance_domains(struct softirq_action *h)
|
||||||
* balancing on behalf of the other idle cpus whose ticks are
|
* balancing on behalf of the other idle cpus whose ticks are
|
||||||
* stopped.
|
* stopped.
|
||||||
*/
|
*/
|
||||||
nohz_idle_balance(this_cpu, idle);
|
nohz_idle_balance(this_rq, idle);
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline int on_null_domain(struct rq *rq)
|
static inline int on_null_domain(struct rq *rq)
|
||||||
|
|
Loading…
Reference in New Issue