migrate-shutdown-reboot-to-boot-cpu-v11

Signed-off-by: Robin Holt <holt@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/kernel/sys.c b/kernel/sys.c
index 14640d72ba1edb44e454e8c4b55da197f02338d2..2bbd9a73b54c27b0e75eb651d931f0987ff870ed 100644 (file)
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -370,19 +370,19 @@ EXPORT_SYMBOL(unregister_reboot_notifier);
 static void migrate_to_reboot_cpu(void)
 {
        /* The boot cpu is always logical cpu 0 */
-       int reboot_cpu = 0;
+       int cpu = 0;
 
        cpu_hotplug_disable();
 
        /* Make certain the cpu I'm about to reboot on is online */
-       if (!cpu_online(reboot_cpu))
-               reboot_cpu = cpumask_first(cpu_online_mask);
+       if (!cpu_online(cpu))
+               cpu = cpumask_first(cpu_online_mask);
 
        /* Prevent races with other tasks migrating this task */
        current->flags |= PF_NO_SETAFFINITY;
 
        /* Make certain I only run on the appropriate processor */
-       set_cpus_allowed_ptr(current, cpumask_of(reboot_cpu));
+       set_cpus_allowed_ptr(current, cpumask_of(cpu));
 }
 
 /**