---

yaml --- r: 108204 b: refs/heads/master c: 279ef6b h: refs/heads/master v: v3
git-mirror · Aug 11, 2008 · e5881a7 · e5881a7
1 parent 443bc9a
commit e5881a7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 77ae651347bdd46830da8b28b1efc5e4a9d7cbd0
+refs/heads/master: 279ef6bbb8308488398c8f33b04c760148428378
diff --git a/trunk/kernel/cpu.c b/trunk/kernel/cpu.c
@@ -349,6 +349,8 @@ static int __cpuinit _cpu_up(unsigned int cpu, int tasks_frozen)
 		goto out_notify;
 	BUG_ON(!cpu_online(cpu));
 
+	cpu_set(cpu, cpu_active_map);
+
 	/* Now call notifier in preparation. */
 	raw_notifier_call_chain(&cpu_chain, CPU_ONLINE | mod, hcpu);
 
@@ -383,9 +385,6 @@ int __cpuinit cpu_up(unsigned int cpu)
 
 	err = _cpu_up(cpu, 0);
 
-	if (cpu_online(cpu))
-		cpu_set(cpu, cpu_active_map);
-
 out:
 	cpu_maps_update_done();
 	return err;