diff --git a/[refs] b/[refs] index cf5db53ff349..a096ed58440f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 32525d022ad52a5c14e80e130260431e16e294b6 +refs/heads/master: 9ec3b77e11b9398ab40b492c4fde7d8aac04a718 diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c index f881fc5e035c..2208692dc4a0 100644 --- a/trunk/kernel/sched_fair.c +++ b/trunk/kernel/sched_fair.c @@ -925,6 +925,9 @@ static int select_task_rq_fair(struct task_struct *p, int sync) this_cpu = smp_processor_id(); new_cpu = cpu; + if (cpu == this_cpu) + goto out_set_cpu; + for_each_domain(this_cpu, sd) { if (cpu_isset(cpu, sd->span)) { this_sd = sd;