---

yaml --- r: 101979 b: refs/heads/master c: b62b8ef h: refs/heads/master i: 101977: 0f21a46 101975: ca37b7b v: v3
git-mirror · Jul 16, 2008 · 633c4a0 · 633c4a0
1 parent 0fb0ca6
commit 633c4a0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 26d46867b7d27f68a446b073dac7817721ae4c8f
+refs/heads/master: b62b8ef906cdf7115af579ce7378886ce3e0ce00
diff --git a/trunk/drivers/acpi/processor_core.c b/trunk/drivers/acpi/processor_core.c
@@ -1014,9 +1014,9 @@ static acpi_status acpi_processor_hotadd_init(acpi_handle handle, int *p_cpu)
 
 static int acpi_processor_handle_eject(struct acpi_processor *pr)
 {
-	if (cpu_online(pr->id)) {
-		return (-EINVAL);
-	}
+	if (cpu_online(pr->id))
+		cpu_down(pr->id);
+
 	arch_unregister_cpu(pr->id);
 	acpi_unmap_lsapic(pr->id);
 	return (0);

diff --git a/trunk/kernel/cpu.c b/trunk/kernel/cpu.c
@@ -299,6 +299,7 @@ int __ref cpu_down(unsigned int cpu)
 	cpu_maps_update_done();
 	return err;
 }
+EXPORT_SYMBOL(cpu_down);
 #endif /*CONFIG_HOTPLUG_CPU*/
 
 /* Requires cpu_add_remove_lock to be held */