From: Andrew Morton <akpm@linux-foundation.org>

Cc: Christoph Lameter <clameter@sgi.com>
Cc: Cliff Wickman <cpw@sgi.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Oleg Nesterov <oleg@tv-sign.ru>
Cc: Paul Jackson <pj@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 kernel/sched.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN include/linux/cpuset.h~hotplug-cpu-migrate-a-task-within-its-cpuset-fix include/linux/cpuset.h
diff -puN kernel/cpuset.c~hotplug-cpu-migrate-a-task-within-its-cpuset-fix kernel/cpuset.c
diff -puN kernel/sched.c~hotplug-cpu-migrate-a-task-within-its-cpuset-fix kernel/sched.c
--- a/kernel/sched.c~hotplug-cpu-migrate-a-task-within-its-cpuset-fix
+++ a/kernel/sched.c
@@ -5150,7 +5150,7 @@ restart:
 
 	/* No more Mr. Nice Guy. */
 	if (dest_cpu == NR_CPUS) {
-		cpumask_t cpus_allowed = cpuset_cpus_allowed_locked();
+		cpumask_t cpus_allowed = cpuset_cpus_allowed_locked(p);
 		/*
 		 * Try to stay on the same cpuset, where the current cpuset
 		 * may be a subset of all cpus.
_