The patch titled hotplug cpu: migrate a task within its cpuset whitespace fix has been removed from the -mm tree. Its filename was hotplug-cpu-migrate-a-task-within-its-cpuset-whitespace-fix.patch This patch was dropped because it was folded into hotplug-cpu-migrate-a-task-within-its-cpuset.patch ------------------------------------------------------ Subject: hotplug cpu: migrate a task within its cpuset whitespace fix From: Paul Jackson <pj@xxxxxxx> Fix indentation and spacing. Signed-off-by: Paul Jackson <pj@xxxxxxx> Cc: Cliff Wickman <cpw@xxxxxxx> Cc: Oleg Nesterov <oleg@xxxxxxxxxx> Cc: Christoph Lameter <clameter@xxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- kernel/sched.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff -puN kernel/sched.c~hotplug-cpu-migrate-a-task-within-its-cpuset-whitespace-fix kernel/sched.c --- a/kernel/sched.c~hotplug-cpu-migrate-a-task-within-its-cpuset-whitespace-fix +++ a/kernel/sched.c @@ -5125,16 +5125,16 @@ static void move_task_off_dead_cpu(int d /* No more Mr. Nice Guy. */ if (dest_cpu == NR_CPUS) { - 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. - * The cpuset_cpus_allowed_locked() variant of - * cpuset_cpus_allowed() will not block - * It must be called within calls to cpuset_lock/cpuset_unlock. - */ + 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. + * The cpuset_cpus_allowed_locked() variant of + * cpuset_cpus_allowed() will not block. It must be + * called within calls to cpuset_lock/cpuset_unlock. + */ rq = task_rq_lock(p, &flags); - p->cpus_allowed = cpus_allowed; + p->cpus_allowed = cpus_allowed; dest_cpu = any_online_cpu(p->cpus_allowed); task_rq_unlock(rq, &flags); _ Patches currently in -mm which might be from pj@xxxxxxx are origin.patch cpuset-zero-malloc-revert-the-old-cpuset-fix.patch task-containersv11-basic-task-container-framework.patch task-containersv11-add-tasks-file-interface.patch task-containersv11-add-fork-exit-hooks.patch task-containersv11-add-container_clone-interface.patch task-containersv11-add-procfs-interface.patch task-containersv11-shared-container-subsystem-group-arrays.patch task-containersv11-automatic-userspace-notification-of-idle-containers.patch task-containersv11-make-cpusets-a-client-of-containers.patch task-containersv11-example-cpu-accounting-subsystem.patch task-containersv11-simple-task-container-debug-info-subsystem.patch task-containers-enable-containers-by-default-in-some-configs.patch cpuset-sched_load_balance-flag.patch cpusets-decrustify-cpuset-mask-update-code.patch fix-cpusets-update_cpumask.patch control-groups-replace-cont-with-cgrp-and-other-misc.patch hotplug-cpu-migrate-a-task-within-its-cpuset.patch hotplug-cpu-migrate-a-task-within-its-cpuset-whitespace-fix.patch hotplug-cpu-migrate-a-task-within-its-cpuset-doc.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html