From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tony Lindgren Subject: [PATCH] ARM: Don't try to send IPI on UP systems with CONFIG_SMP Date: Tue, 7 Sep 2010 20:14:05 -0700 Message-ID: <20100908031404.GJ22507@atomide.com> References: <20100817104414.19061.38999.stgit@baageli.muru.com> <20100906104413.GD20903@n2100.arm.linux.org.uk> <20100906180346.GC20849@atomide.com> <20100908030951.GH22507@atomide.com> <20100908031214.GI22507@atomide.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mho-01-ewr.mailhop.org ([204.13.248.71]:53493 "EHLO mho-01-ewr.mailhop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756588Ab0IHDOI (ORCPT ); Tue, 7 Sep 2010 23:14:08 -0400 Content-Disposition: inline In-Reply-To: <20100908031214.GI22507@atomide.com> Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: Russell King - ARM Linux Cc: linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org, bryan.wu@canonical.com This is not needed on UP. Additionally with will cause issues when booting CONFIG_SMP_ON_UP kernel on earlier ARM cores. Signed-off-by: Tony Lindgren diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c index 401e38b..5facdbe 100644 --- a/arch/arm/kernel/process.c +++ b/arch/arm/kernel/process.c @@ -207,9 +207,7 @@ __setup("reboot=", reboot_setup); void machine_shutdown(void) { -#ifdef CONFIG_SMP smp_send_stop(); -#endif } void machine_halt(void) diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c index 40dc74f..16ca27b 100644 --- a/arch/arm/kernel/smp.c +++ b/arch/arm/kernel/smp.c @@ -560,12 +560,17 @@ asmlinkage void __exception do_IPI(struct pt_regs *regs) void smp_send_reschedule(int cpu) { - send_ipi_message(cpumask_of(cpu), IPI_RESCHEDULE); + if (is_smp()) + send_ipi_message(cpumask_of(cpu), IPI_RESCHEDULE); } void smp_send_stop(void) { cpumask_t mask = cpu_online_map; + + if (!is_smp()) + return; + cpu_clear(smp_processor_id(), mask); send_ipi_message(&mask, IPI_CPU_STOP); } From mboxrd@z Thu Jan 1 00:00:00 1970 From: tony@atomide.com (Tony Lindgren) Date: Tue, 7 Sep 2010 20:14:05 -0700 Subject: [PATCH] ARM: Don't try to send IPI on UP systems with CONFIG_SMP In-Reply-To: <20100908031214.GI22507@atomide.com> References: <20100817104414.19061.38999.stgit@baageli.muru.com> <20100906104413.GD20903@n2100.arm.linux.org.uk> <20100906180346.GC20849@atomide.com> <20100908030951.GH22507@atomide.com> <20100908031214.GI22507@atomide.com> Message-ID: <20100908031404.GJ22507@atomide.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org This is not needed on UP. Additionally with will cause issues when booting CONFIG_SMP_ON_UP kernel on earlier ARM cores. Signed-off-by: Tony Lindgren diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c index 401e38b..5facdbe 100644 --- a/arch/arm/kernel/process.c +++ b/arch/arm/kernel/process.c @@ -207,9 +207,7 @@ __setup("reboot=", reboot_setup); void machine_shutdown(void) { -#ifdef CONFIG_SMP smp_send_stop(); -#endif } void machine_halt(void) diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c index 40dc74f..16ca27b 100644 --- a/arch/arm/kernel/smp.c +++ b/arch/arm/kernel/smp.c @@ -560,12 +560,17 @@ asmlinkage void __exception do_IPI(struct pt_regs *regs) void smp_send_reschedule(int cpu) { - send_ipi_message(cpumask_of(cpu), IPI_RESCHEDULE); + if (is_smp()) + send_ipi_message(cpumask_of(cpu), IPI_RESCHEDULE); } void smp_send_stop(void) { cpumask_t mask = cpu_online_map; + + if (!is_smp()) + return; + cpu_clear(smp_processor_id(), mask); send_ipi_message(&mask, IPI_CPU_STOP); }