summaryrefslogtreecommitdiff
path: root/kernel/sched/core.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/sched/core.c')
-rw-r--r--kernel/sched/core.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 9a7afadff1f4..1b20fc0ec4a7 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -557,17 +557,18 @@ void resched_cpu(int cpu)
*/
int get_nohz_timer_target(int pinned)
{
- int cpu = smp_processor_id();
- int i;
+ int cpu = smp_processor_id(), i;
struct sched_domain *sd;
- if (pinned || !get_sysctl_timer_migration() || !idle_cpu(cpu))
+ if (pinned || !get_sysctl_timer_migration() ||
+ !(idle_cpu(cpu) || cpu_quiesced(cpu)))
return cpu;
rcu_read_lock();
for_each_domain(cpu, sd) {
for_each_cpu(i, sched_domain_span(sd)) {
- if (!idle_cpu(i)) {
+ /* Don't push timers to quiesced CPUs */
+ if (!(cpu_quiesced(i) || idle_cpu(i))) {
cpu = i;
goto unlock;
}