[PATCH] powerpc/85xx: Add back condition for smp

Kumar Gala galak at kernel.crashing.org
Wed Apr 18 23:37:21 EST 2012


On Apr 17, 2012, at 4:39 PM, York Sun wrote:

> The timebase synchronization is only necessary if we need to reset a
> separate core.  Currently only KEXEC and CPU hotplug require resetting
> a single core. The following code should be in the condition of
> CONFIG_KEXEC or CONFIG_HOTPLUG_CPU
> 
>        .give_timebase  = smp_generic_give_timebase,
>        .take_timebase  = smp_generic_take_timebase,

This doesn't explain why you are putting the #ifdef back, only under what conditions it applies.

> 
> Signed-off-by: York Sun <yorksun at freescale.com>
> Acked-by: Li Yang <leoli at freescale.com>
> ---
> arch/powerpc/platforms/85xx/smp.c |    2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/powerpc/platforms/85xx/smp.c b/arch/powerpc/platforms/85xx/smp.c
> index 56942af..868c6d7 100644
> --- a/arch/powerpc/platforms/85xx/smp.c
> +++ b/arch/powerpc/platforms/85xx/smp.c
> @@ -192,8 +192,10 @@ struct smp_ops_t smp_85xx_ops = {
> 	.cpu_disable	= generic_cpu_disable,
> 	.cpu_die	= generic_cpu_die,
> #endif
> +#if defined(CONFIG_KEXEC) || defined(CONFIG_HOTPLUG_CPU)
> 	.give_timebase	= smp_generic_give_timebase,
> 	.take_timebase	= smp_generic_take_timebase,
> +#endif
> };
> 
> #ifdef CONFIG_KEXEC
> -- 
> 1.7.0.4
> 
> 
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev at lists.ozlabs.org
> https://lists.ozlabs.org/listinfo/linuxppc-dev



More information about the Linuxppc-dev mailing list