From 0665ae95e3140e8566dd1d6d5283fc45c800c1fd Mon Sep 17 00:00:00 2001
From: Javier Martinez Canillas <javier@dowhile0.org>
Date: Sat, 28 Jul 2012 15:19:55 +0100
Subject: [PATCH] --- yaml --- r: 321105 b: refs/heads/master c:
 c5dff4ffd327088d85035bec535b7d0c9ea03151 h: refs/heads/master i:   321103:
 c98db2bdcbb8196ff5f1816cf834fd8c167facde v: v3

---
 [refs]                      | 2 +-
 trunk/arch/arm/kernel/smp.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index bbf896783c6a..4d9765ad9797 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5a783cbc48367cfc7b65afc75430953dfe60098f
+refs/heads/master: c5dff4ffd327088d85035bec535b7d0c9ea03151
diff --git a/trunk/arch/arm/kernel/smp.c b/trunk/arch/arm/kernel/smp.c
index aea74f5bc34a..ebd8ad274d76 100644
--- a/trunk/arch/arm/kernel/smp.c
+++ b/trunk/arch/arm/kernel/smp.c
@@ -563,7 +563,8 @@ void smp_send_stop(void)
 
 	cpumask_copy(&mask, cpu_online_mask);
 	cpumask_clear_cpu(smp_processor_id(), &mask);
-	smp_cross_call(&mask, IPI_CPU_STOP);
+	if (!cpumask_empty(&mask))
+		smp_cross_call(&mask, IPI_CPU_STOP);
 
 	/* Wait up to one second for other CPUs to stop */
 	timeout = USEC_PER_SEC;