---

yaml --- r: 279915 b: refs/heads/master c: 02b73e2 h: refs/heads/master i: 279913: a05760c 279911: 69fd99f v: v3
git-mirror · Dec 12, 2011 · d98d6bd · d98d6bd
1 parent 3d550c5
commit d98d6bd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 290130a17718c1451bb8a77a5e2510e0279bd5f3
+refs/heads/master: 02b73e2e9c288cbbb6ec96bef628cf08e29824c4
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
@@ -2001,7 +2001,7 @@ config XIP_PHYS_ADDR
 
 config KEXEC
 	bool "Kexec system call (EXPERIMENTAL)"
-	depends on EXPERIMENTAL
+	depends on EXPERIMENTAL && (!SMP || HOTPLUG_CPU)
 	help
 	  kexec is a system call that implements the ability to shutdown your
 	  current kernel, and to start another kernel.  It is like a reboot

diff --git a/trunk/arch/arm/kernel/smp.c b/trunk/arch/arm/kernel/smp.c
@@ -522,6 +522,10 @@ static void ipi_cpu_stop(unsigned int cpu)
 	local_fiq_disable();
 	local_irq_disable();
 
+#ifdef CONFIG_HOTPLUG_CPU
+	platform_cpu_kill(cpu);
+#endif
+
 	while (1)
 		cpu_relax();
 }