From 5ec80a8b967cb60a6cb2676025b0ee1ae7a0ce97 Mon Sep 17 00:00:00 2001
From: Shawn Guo <shawn.guo@linaro.org>
Date: Thu, 4 Oct 2012 17:12:23 -0700
Subject: [PATCH] --- yaml --- r: 330060 b: refs/heads/master c:
 f96972f2dc6365421cf2366ebd61ee4cf060c8d5 h: refs/heads/master v: v3

---
 [refs]             | 2 +-
 trunk/kernel/sys.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 3fbcb43559f8..2c5ebe420d77 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9f6547a3209b78689ab8183630df87ca5e13fec0
+refs/heads/master: f96972f2dc6365421cf2366ebd61ee4cf060c8d5
diff --git a/trunk/kernel/sys.c b/trunk/kernel/sys.c
index f9492284e5d2..fdad206165d0 100644
--- a/trunk/kernel/sys.c
+++ b/trunk/kernel/sys.c
@@ -368,6 +368,7 @@ EXPORT_SYMBOL(unregister_reboot_notifier);
 void kernel_restart(char *cmd)
 {
 	kernel_restart_prepare(cmd);
+	disable_nonboot_cpus();
 	if (!cmd)
 		printk(KERN_EMERG "Restarting system.\n");
 	else