From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Tue, 5 Feb 2008 15:50:39 +0000 (+0100)
Subject: [S390] Fix smp_call_function_mask semantics.
X-Git-Tag: v2.6.25-rc1~786^2~11
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=37c5f719e71882b759fa8acbdd11d5ca3a7965bb;p=linux-2.6-omap-h63xx.git

[S390] Fix smp_call_function_mask semantics.

Make sure func isn't called on the local cpu just like on all other
architectures that implement this function.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
---

diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c
index aa37fa15451..f5046fd4930 100644
--- a/arch/s390/kernel/smp.c
+++ b/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;