On Tue, Sep 07, 2010 at 08:14:05PM -0700, Tony Lindgren wrote:
> This is not needed on UP. Additionally with will cause issues when
> booting CONFIG_SMP_ON_UP kernel on earlier ARM cores.
Doesn't make sense.
>
> Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
>
> 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
This will cause a link error as smp.c is not built for uniprocessor
builds.
> }
>
> 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);
There won't be any other CPUs to send an IPI to - and all places which
call this are protected by a check for cpu == smp_processor_id() - in
other words, this will never be called for the current CPU.
> }
>
> void smp_send_stop(void)
> {
> cpumask_t mask = cpu_online_map;
> +
> + if (!is_smp())
> + return;
> +
> cpu_clear(smp_processor_id(), mask);
This results in an empty CPU mask. It might be better to do instead:
if (!cpus_empty(mask))
> send_ipi_message(&mask, IPI_CPU_STOP);
> }
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
