From 441ae9101f5768d804cce06e950142abec15be66 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Tue, 5 Feb 2008 16:50:39 +0100
Subject: [PATCH] --- yaml --- r: 83296 b: refs/heads/master c:
 37c5f719e71882b759fa8acbdd11d5ca3a7965bb h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/arch/s390/kernel/smp.c | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 13abc252b498..e6140fdf50d7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a817a61f85c75181bde6c3d83ae11a24b089dd6a
+refs/heads/master: 37c5f719e71882b759fa8acbdd11d5ca3a7965bb
diff --git a/trunk/arch/s390/kernel/smp.c b/trunk/arch/s390/kernel/smp.c
index aa37fa154512..f5046fd4930f 100644
--- a/trunk/arch/s390/kernel/smp.c
+++ b/trunk/arch/s390/kernel/smp.c
@@ -225,12 +225,11 @@ EXPORT_SYMBOL(smp_call_function_single);
  * You must not call this function with disabled interrupts or from a
  * hardware interrupt handler or from a bottom half handler.
  */
-int
-smp_call_function_mask(cpumask_t mask,
-			void (*func)(void *), void *info,
-			int wait)
+int smp_call_function_mask(cpumask_t mask, void (*func)(void *), void *info,
+			   int wait)
 {
 	preempt_disable();
+	cpu_clear(smp_processor_id(), mask);
 	__smp_call_function_map(func, info, 0, wait, mask);
 	preempt_enable();
 	return 0;