diff options
author | Alex Shi <alex.shi@intel.com> | 2012-09-10 03:10:58 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2012-09-13 10:52:05 -0400 |
commit | c1cc017c59c44d9ede7003631c43adc0cfdce2f9 (patch) | |
tree | 7db4bad5a78af2bdc5197740012e462811422d40 /kernel/time | |
parent | 08bedae1d0acd8c9baf514fb69fa199d0c8345f6 (diff) |
sched/nohz: Clean up select_nohz_load_balancer()
There is no load_balancer to be selected now. It just sets the
state of the nohz tick to stop.
So rename the function, pass the 'cpu' as a parameter and then
remove the useless call from tick_nohz_restart_sched_tick().
[ s/set_nohz_tick_stopped/nohz_balance_enter_idle/g
s/clear_nohz_tick_stopped/nohz_balance_exit_idle/g ]
Signed-off-by: Alex Shi <alex.shi@intel.com>
Acked-by: Suresh Siddha <suresh.b.siddha@intel.com>
Cc: Venkatesh Pallipadi <venki@google.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1347261059-24747-1-git-send-email-alex.shi@intel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/time')
-rw-r--r-- | kernel/time/tick-sched.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c index 3a9e5d5c1091..1a5ee90eea33 100644 --- a/kernel/time/tick-sched.c +++ b/kernel/time/tick-sched.c | |||
@@ -372,7 +372,7 @@ static ktime_t tick_nohz_stop_sched_tick(struct tick_sched *ts, | |||
372 | * the scheduler tick in nohz_restart_sched_tick. | 372 | * the scheduler tick in nohz_restart_sched_tick. |
373 | */ | 373 | */ |
374 | if (!ts->tick_stopped) { | 374 | if (!ts->tick_stopped) { |
375 | select_nohz_load_balancer(1); | 375 | nohz_balance_enter_idle(cpu); |
376 | calc_load_enter_idle(); | 376 | calc_load_enter_idle(); |
377 | 377 | ||
378 | ts->last_tick = hrtimer_get_expires(&ts->sched_timer); | 378 | ts->last_tick = hrtimer_get_expires(&ts->sched_timer); |
@@ -569,7 +569,6 @@ static void tick_nohz_restart(struct tick_sched *ts, ktime_t now) | |||
569 | static void tick_nohz_restart_sched_tick(struct tick_sched *ts, ktime_t now) | 569 | static void tick_nohz_restart_sched_tick(struct tick_sched *ts, ktime_t now) |
570 | { | 570 | { |
571 | /* Update jiffies first */ | 571 | /* Update jiffies first */ |
572 | select_nohz_load_balancer(0); | ||
573 | tick_do_update_jiffies64(now); | 572 | tick_do_update_jiffies64(now); |
574 | update_cpu_load_nohz(); | 573 | update_cpu_load_nohz(); |
575 | 574 | ||