aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorMike J. Chen <mjchen@google.com>2012-05-24 15:12:36 -0700
committerArve Hjønnevåg <arve@android.com>2013-04-29 14:43:02 -0700
commit5b34d436c1d67b0be294cf4f299e3eff26e71dbe (patch)
tree73ce660a580e10e44aafb57792892c2d46a75670 /arch
parent828b1dc776d8609e90ef503af393d65d14963bec (diff)
ARM: disable preemption in machine_shutdown
Since the smp call to stop the other cpus are handled in those cpus in interrupt context, there's a potential for those smp handlers to interrupt threads holding spin locks (such as the one a mutex holds). This prevents those threads from ever releasing their spin lock, so if the cpu doing the shutdown is allowed to switch to another thread that tries to grab the same lock/mutex, we could get into a deadlock (the spin lock call is called with preemption disabled in the mutex lock code). To avoid that possibility, disable preemption before doing the smp_send_stop(). Change-Id: I7976c5382d7173fcb3cd14da8cc5083d442b2544 Signed-off-by: Mike J. Chen <mjchen@google.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/kernel/process.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
index c72016c1762..1a4a176134f 100644
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
@@ -275,6 +275,15 @@ __setup("reboot=", reboot_setup);
void machine_shutdown(void)
{
#ifdef CONFIG_SMP
+ /*
+ * Disable preemption so we're guaranteed to
+ * run to power off or reboot and prevent
+ * the possibility of switching to another
+ * thread that might wind up blocking on
+ * one of the stopped CPUs.
+ */
+ preempt_disable();
+
smp_send_stop();
#endif
}