From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752099Ab3LOQmq (ORCPT ); Sun, 15 Dec 2013 11:42:46 -0500 Received: from mail-pd0-f172.google.com ([209.85.192.172]:61601 "EHLO mail-pd0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751688Ab3LOQmo (ORCPT ); Sun, 15 Dec 2013 11:42:44 -0500 From: Jiang Liu To: Andrew Morton , Shaohua Li , David Howells , Koichi Yasutake , Geert Uytterhoeven , David Daney , Thomas Gleixner , "Srivatsa S. Bhat" , Greg Kroah-Hartman , linux-am33-list@redhat.com, linux-kernel@vger.kernel.org Cc: Jiang Liu , Ingo Molnar , Peter Zijlstra , Steven Rostedt , Jiri Kosina , Wang YanQing , linux-arch@vger.kernel.org Subject: [PATCH v3 [resend] 09/18] smp, mn10300: kill SMP single function call interrupt Date: Mon, 16 Dec 2013 00:36:31 +0800 Message-Id: <1387125400-28849-10-git-send-email-liuj97@gmail.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1387125400-28849-1-git-send-email-liuj97@gmail.com> References: <1387125400-28849-1-git-send-email-liuj97@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Rename CALL_FUNC_SINGLE_IPI as CALL_FUNC_IPI to prepare for killing generic_smp_call_function_single_interrupt(). Cc: Andrew Morton Cc: Shaohua Li Cc: Peter Zijlstra Cc: Ingo Molnar Cc: Steven Rostedt Cc: Jiri Kosina Cc: David Howells Cc: Koichi Yasutake Cc: linux-am33-list@redhat.com Signed-off-by: Jiang Liu --- arch/mn10300/include/asm/smp.h | 2 +- arch/mn10300/kernel/smp.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/mn10300/include/asm/smp.h b/arch/mn10300/include/asm/smp.h index 56c4241..8e689d1 100644 --- a/arch/mn10300/include/asm/smp.h +++ b/arch/mn10300/include/asm/smp.h @@ -31,7 +31,7 @@ #include #define RESCHEDULE_IPI 63 -#define CALL_FUNC_SINGLE_IPI 192 +#define CALL_FUNC_IPI 192 #define LOCAL_TIMER_IPI 193 #define FLUSH_CACHE_IPI 194 #define CALL_FUNCTION_NMI_IPI 195 diff --git a/arch/mn10300/kernel/smp.c b/arch/mn10300/kernel/smp.c index a17f9c9..7ae353d 100644 --- a/arch/mn10300/kernel/smp.c +++ b/arch/mn10300/kernel/smp.c @@ -164,11 +164,11 @@ static void init_ipi(void) mn10300_ipi_enable(RESCHEDULE_IPI); /* set up the call function IPI */ - irq_set_chip_and_handler(CALL_FUNC_SINGLE_IPI, &mn10300_ipi_type, + irq_set_chip_and_handler(CALL_FUNC_IPI, &mn10300_ipi_type, handle_percpu_irq); - setup_irq(CALL_FUNC_SINGLE_IPI, &call_function_ipi); - set_intr_level(CALL_FUNC_SINGLE_IPI, CALL_FUNCTION_GxICR_LV); - mn10300_ipi_enable(CALL_FUNC_SINGLE_IPI); + setup_irq(CALL_FUNC_IPI, &call_function_ipi); + set_intr_level(CALL_FUNC_IPI, CALL_FUNCTION_GxICR_LV); + mn10300_ipi_enable(CALL_FUNC_IPI); /* set up the local timer IPI */ #if !defined(CONFIG_GENERIC_CLOCKEVENTS) || \ @@ -362,7 +362,7 @@ void arch_send_call_function_ipi_mask(const struct cpumask *mask) void arch_send_call_function_single_ipi(int cpu) { - send_IPI_mask(cpumask_of(cpu), CALL_FUNC_SINGLE_IPI); + send_IPI_mask(cpumask_of(cpu), CALL_FUNC_IPI); } /** @@ -519,7 +519,7 @@ static irqreturn_t smp_reschedule_interrupt(int irq, void *dev_id) static irqreturn_t smp_call_function_interrupt(int irq, void *dev_id) { /* generic_smp_call_function_interrupt(); */ - generic_smp_call_function_single_interrupt(); + generic_smp_call_function_interrupt(); return IRQ_HANDLED; } @@ -598,8 +598,8 @@ static void __init smp_cpu_init(void) /* Force FPU initialization */ clear_using_fpu(current); - GxICR(CALL_FUNC_SINGLE_IPI) = CALL_FUNCTION_GxICR_LV | GxICR_DETECT; - mn10300_ipi_enable(CALL_FUNC_SINGLE_IPI); + GxICR(CALL_FUNC_IPI) = CALL_FUNCTION_GxICR_LV | GxICR_DETECT; + mn10300_ipi_enable(CALL_FUNC_IPI); GxICR(LOCAL_TIMER_IPI) = LOCAL_TIMER_GxICR_LV | GxICR_DETECT; mn10300_ipi_enable(LOCAL_TIMER_IPI); -- 1.8.1.2