[RFC PATCH v3 13/19] smp, s390: prepare for killing generic_smp_call_function_single_interrupt()

[RFC PATCH v3 13/19] smp, s390: prepare for killing generic_smp_call_function_single_interrupt()

[Jiang Liu]

Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Shaohua Li <shli@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Jiri Kosina <trivial@kernel.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: linux390@de.ibm.com
Signed-off-by: Jiang Liu <liuj97@gmail.com>
---
 arch/s390/kernel/smp.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c
index dc4a534..e550afd 100644
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
@@ -49,7 +49,7 @@
 
 enum {
 	ec_schedule = 0,
-	ec_call_function_single,
+	ec_call_function,
 	ec_stop_cpu,
 };
 
@@ -437,8 +437,8 @@ static void smp_handle_ext_call(void)
 		smp_stop_cpu();
 	if (test_bit(ec_schedule, &bits))
 		scheduler_ipi();
-	if (test_bit(ec_call_function_single, &bits))
-		generic_smp_call_function_single_interrupt();
+	if (test_bit(ec_call_function, &bits))
+		generic_smp_call_function_interrupt();
 }
 
 static void do_ext_call_interrupt(struct ext_code ext_code,
@@ -453,12 +453,12 @@ void arch_send_call_function_ipi_mask(const struct cpumask *mask)
 	int cpu;
 
 	for_each_cpu(cpu, mask)
-		pcpu_ec_call(pcpu_devices + cpu, ec_call_function_single);
+		pcpu_ec_call(pcpu_devices + cpu, ec_call_function);
 }
 
 void arch_send_call_function_single_ipi(int cpu)
 {
-	pcpu_ec_call(pcpu_devices + cpu, ec_call_function_single);
+	pcpu_ec_call(pcpu_devices + cpu, ec_call_function);
 }
 
 #ifndef CONFIG_64BIT
-- 
1.8.1.2

Re: [RFC PATCH v3 13/19] smp, s390: prepare for killing generic_smp_call_function_single_interrupt()

[Heiko Carstens]

On Thu, Dec 05, 2013 at 12:13:04AM +0800, Jiang Liu wrote:
> Signed-off-by: Jiang Liu <liuj97@gmail.com>
> ---
>  arch/s390/kernel/smp.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)

I assume you will take care and make sure it gets merged?
Besides that:

Acked-by: Heiko Carstens <heiko.carstens@de.ibm.com>