---

yaml --- r: 126923 b: refs/heads/master c: a0e280e h: refs/heads/master i: 126921: 772d884 126919: c0c0d50 v: v3
git-mirror · Jan 7, 2009 · 6da1b46 · 6da1b46
1 parent 0fb9900
commit 6da1b46
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 30aafdba6f78619274a977d67283a681bedbcbbd
+refs/heads/master: a0e280e0f33f6c859a235fb69a875ed8f3420388
diff --git a/trunk/kernel/cpu.c b/trunk/kernel/cpu.c
@@ -379,8 +379,11 @@ static cpumask_var_t frozen_cpus;
 
 int disable_nonboot_cpus(void)
 {
-	int cpu, first_cpu, error = 0;
+	int cpu, first_cpu, error;
 
+	error = stop_machine_create();
+	if (error)
+		return error;
 	cpu_maps_update_begin();
 	first_cpu = cpumask_first(cpu_online_mask);
 	/* We take down all of the non-boot CPUs in one shot to avoid races
@@ -409,6 +412,7 @@ int disable_nonboot_cpus(void)
 		printk(KERN_ERR "Non-boot CPUs are not disabled\n");
 	}
 	cpu_maps_update_done();
+	stop_machine_destroy();
 	return error;
 }