X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=kernel%2Fstop_machine.c;h=ef51d1fcf5e6ddc818b5c85993801508e5ae9684;hb=8c7b09f43f4bf570654bcc458ce96819a932303c;hp=884c7a1afeed38f8dfdddc65fe04c0bca551c8bf;hpb=3fc1f1e27a5b807791d72e5d992aa33b668a6626;p=safe%2Fjmp%2Flinux-2.6

diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c
index 884c7a1..ef51d1f 100644
--- a/kernel/stop_machine.c
+++ b/kernel/stop_machine.c
@@ -301,7 +301,7 @@ static int __cpuinit cpu_stop_cpu_callback(struct notifier_block *nfb,
 	case CPU_UP_PREPARE:
 		BUG_ON(stopper->thread || stopper->enabled ||
 		       !list_empty(&stopper->works));
-		p = kthread_create(cpu_stopper_thread, stopper, "stopper/%d",
+		p = kthread_create(cpu_stopper_thread, stopper, "migration/%d",
 				   cpu);
 		if (IS_ERR(p))
 			return NOTIFY_BAD;
@@ -375,6 +375,8 @@ static int __init cpu_stop_init(void)
 }
 early_initcall(cpu_stop_init);
 
+#ifdef CONFIG_STOP_MACHINE
+
 /* This controls the threads on each CPU. */
 enum stopmachine_state {
 	/* Dummy starting state for thread. */
@@ -477,3 +479,5 @@ int stop_machine(int (*fn)(void *), void *data, const struct cpumask *cpus)
 	return ret;
 }
 EXPORT_SYMBOL_GPL(stop_machine);
+
+#endif	/* CONFIG_STOP_MACHINE */