diff --git a/[refs] b/[refs] index 9c6e72fea6d6..ccbfe9e63629 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 77e81365e0b7d7479fc444a21cea0cd4def70b45 +refs/heads/master: 76854c7e8f3f4172fef091e78d88b3b751463ac6 diff --git a/trunk/kernel/sched/fair.c b/trunk/kernel/sched/fair.c index 96a9ecec699b..8e534a05e3ed 100644 --- a/trunk/kernel/sched/fair.c +++ b/trunk/kernel/sched/fair.c @@ -2744,6 +2744,9 @@ select_task_rq_fair(struct task_struct *p, int sd_flag, int wake_flags) int want_sd = 1; int sync = wake_flags & WF_SYNC; + if (p->rt.nr_cpus_allowed == 1) + return prev_cpu; + if (sd_flag & SD_BALANCE_WAKE) { if (cpumask_test_cpu(cpu, tsk_cpus_allowed(p))) want_affine = 1; diff --git a/trunk/kernel/sched/rt.c b/trunk/kernel/sched/rt.c index 023b35502509..58a48444e5c9 100644 --- a/trunk/kernel/sched/rt.c +++ b/trunk/kernel/sched/rt.c @@ -1200,6 +1200,9 @@ select_task_rq_rt(struct task_struct *p, int sd_flag, int flags) cpu = task_cpu(p); + if (p->rt.nr_cpus_allowed == 1) + goto out; + /* For anything but wake ups, just return the task_cpu */ if (sd_flag != SD_BALANCE_WAKE && sd_flag != SD_BALANCE_FORK) goto out;