public inbox for linux-arm-kernel@lists.infradead.org
 help / color / mirror / Atom feed
* [PATCH] ARM: mvebu: Select HAVE_ARM_TWD only if SMP is enabled
@ 2014-04-24 11:34 Ezequiel Garcia
  2014-04-25  2:18 ` Ezequiel Garcia
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Ezequiel Garcia @ 2014-04-24 11:34 UTC (permalink / raw)
  To: linux-arm-kernel

HAVE_ARM_TWD depends on SMP, so we should only select it if
SMP is enabled, as the others platforms do.

Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
---
 arch/arm/mach-mvebu/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
index 7bb92b1..8c9fd60 100644
--- a/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@ -41,7 +41,7 @@ config MACH_ARMADA_375
 	select ARMADA_375_CLK
 	select CPU_V7
 	select HAVE_ARM_SCU
-	select HAVE_ARM_TWD
+	select HAVE_ARM_TWD if SMP
 	select HAVE_SMP
 	select MACH_MVEBU_V7
 	select PINCTRL_ARMADA_375
@@ -57,7 +57,7 @@ config MACH_ARMADA_38X
 	select ARMADA_38X_CLK
 	select CPU_V7
 	select HAVE_ARM_SCU
-	select HAVE_ARM_TWD
+	select HAVE_ARM_TWD if SMP
 	select HAVE_SMP
 	select MACH_MVEBU_V7
 	select PINCTRL_ARMADA_38X
-- 
1.9.1

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH] ARM: mvebu: Select HAVE_ARM_TWD only if SMP is enabled
  2014-04-24 11:34 [PATCH] ARM: mvebu: Select HAVE_ARM_TWD only if SMP is enabled Ezequiel Garcia
@ 2014-04-25  2:18 ` Ezequiel Garcia
  2014-04-25 21:26 ` Jason Cooper
  2014-04-26  0:46 ` Jason Cooper
  2 siblings, 0 replies; 6+ messages in thread
From: Ezequiel Garcia @ 2014-04-25  2:18 UTC (permalink / raw)
  To: linux-arm-kernel

Jason,

On Apr 24, Ezequiel Garcia wrote:
> HAVE_ARM_TWD depends on SMP, so we should only select it if
> SMP is enabled, as the others platforms do.
> 
> Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
> ---
>  arch/arm/mach-mvebu/Kconfig | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
> index 7bb92b1..8c9fd60 100644
> --- a/arch/arm/mach-mvebu/Kconfig
> +++ b/arch/arm/mach-mvebu/Kconfig
> @@ -41,7 +41,7 @@ config MACH_ARMADA_375
>  	select ARMADA_375_CLK
>  	select CPU_V7
>  	select HAVE_ARM_SCU
> -	select HAVE_ARM_TWD
> +	select HAVE_ARM_TWD if SMP
>  	select HAVE_SMP
>  	select MACH_MVEBU_V7
>  	select PINCTRL_ARMADA_375
> @@ -57,7 +57,7 @@ config MACH_ARMADA_38X
>  	select ARMADA_38X_CLK
>  	select CPU_V7
>  	select HAVE_ARM_SCU
> -	select HAVE_ARM_TWD
> +	select HAVE_ARM_TWD if SMP
>  	select HAVE_SMP
>  	select MACH_MVEBU_V7
>  	select PINCTRL_ARMADA_38X
> -- 
> 1.9.1
> 

As pointed out by Thomas, this fixes a build break when SMP=n. Maybe you can
merge it sooner than later?
-- 
Ezequiel Garc?a, Free Electrons
Embedded Linux, Kernel and Android Engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH] ARM: mvebu: Select HAVE_ARM_TWD only if SMP is enabled
  2014-04-24 11:34 [PATCH] ARM: mvebu: Select HAVE_ARM_TWD only if SMP is enabled Ezequiel Garcia
  2014-04-25  2:18 ` Ezequiel Garcia
@ 2014-04-25 21:26 ` Jason Cooper
  2014-04-25 21:37   ` Ezequiel Garcia
  2014-04-26  0:46 ` Jason Cooper
  2 siblings, 1 reply; 6+ messages in thread
From: Jason Cooper @ 2014-04-25 21:26 UTC (permalink / raw)
  To: linux-arm-kernel

On Thu, Apr 24, 2014 at 08:34:36AM -0300, Ezequiel Garcia wrote:
> HAVE_ARM_TWD depends on SMP, so we should only select it if
> SMP is enabled, as the others platforms do.
> 
> Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
> ---
>  arch/arm/mach-mvebu/Kconfig | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

I just tried to apply this against mvebu/fixes.  It failed.  What did
you base this against?

Can you resubmit based against mvebu/fixes so I can queue it up for
v3.15-rcX ?

thx,

Jason.

> diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
> index 7bb92b1..8c9fd60 100644
> --- a/arch/arm/mach-mvebu/Kconfig
> +++ b/arch/arm/mach-mvebu/Kconfig
> @@ -41,7 +41,7 @@ config MACH_ARMADA_375
>  	select ARMADA_375_CLK
>  	select CPU_V7
>  	select HAVE_ARM_SCU
> -	select HAVE_ARM_TWD
> +	select HAVE_ARM_TWD if SMP
>  	select HAVE_SMP
>  	select MACH_MVEBU_V7
>  	select PINCTRL_ARMADA_375
> @@ -57,7 +57,7 @@ config MACH_ARMADA_38X
>  	select ARMADA_38X_CLK
>  	select CPU_V7
>  	select HAVE_ARM_SCU
> -	select HAVE_ARM_TWD
> +	select HAVE_ARM_TWD if SMP
>  	select HAVE_SMP
>  	select MACH_MVEBU_V7
>  	select PINCTRL_ARMADA_38X
> -- 
> 1.9.1
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH] ARM: mvebu: Select HAVE_ARM_TWD only if SMP is enabled
  2014-04-25 21:26 ` Jason Cooper
@ 2014-04-25 21:37   ` Ezequiel Garcia
  2014-04-25 21:42     ` Jason Cooper
  0 siblings, 1 reply; 6+ messages in thread
From: Ezequiel Garcia @ 2014-04-25 21:37 UTC (permalink / raw)
  To: linux-arm-kernel

On Apr 25, Jason Cooper wrote:
> On Thu, Apr 24, 2014 at 08:34:36AM -0300, Ezequiel Garcia wrote:
> > HAVE_ARM_TWD depends on SMP, so we should only select it if
> > SMP is enabled, as the others platforms do.
> > 
> > Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
> > ---
> >  arch/arm/mach-mvebu/Kconfig | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> I just tried to apply this against mvebu/fixes.  It failed.  What did
> you base this against?
> 

This is a fix for the recent SMP support that you've merged in mvebu/soc.

In particular, it fixes:

[PATCH v3 08/11] ARM: mvebu: add SMP support for Armada 375 and Armada 38x

Yeah, I know: I wasn't really clear in the commit log. Sorry about that.
-- 
Ezequiel Garc?a, Free Electrons
Embedded Linux, Kernel and Android Engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH] ARM: mvebu: Select HAVE_ARM_TWD only if SMP is enabled
  2014-04-25 21:37   ` Ezequiel Garcia
@ 2014-04-25 21:42     ` Jason Cooper
  0 siblings, 0 replies; 6+ messages in thread
From: Jason Cooper @ 2014-04-25 21:42 UTC (permalink / raw)
  To: linux-arm-kernel

On Fri, Apr 25, 2014 at 06:37:59PM -0300, Ezequiel Garcia wrote:
> On Apr 25, Jason Cooper wrote:
> > On Thu, Apr 24, 2014 at 08:34:36AM -0300, Ezequiel Garcia wrote:
> > > HAVE_ARM_TWD depends on SMP, so we should only select it if
> > > SMP is enabled, as the others platforms do.
> > > 
> > > Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
> > > ---
> > >  arch/arm/mach-mvebu/Kconfig | 4 ++--
> > >  1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > I just tried to apply this against mvebu/fixes.  It failed.  What did
> > you base this against?
> > 
> 
> This is a fix for the recent SMP support that you've merged in mvebu/soc.

duh.  Sorry, I was moving fast and just recalled that you wanted this in
'soon'  which I thought meant for v3.15.  No problem then.

thx,

Jason.

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH] ARM: mvebu: Select HAVE_ARM_TWD only if SMP is enabled
  2014-04-24 11:34 [PATCH] ARM: mvebu: Select HAVE_ARM_TWD only if SMP is enabled Ezequiel Garcia
  2014-04-25  2:18 ` Ezequiel Garcia
  2014-04-25 21:26 ` Jason Cooper
@ 2014-04-26  0:46 ` Jason Cooper
  2 siblings, 0 replies; 6+ messages in thread
From: Jason Cooper @ 2014-04-26  0:46 UTC (permalink / raw)
  To: linux-arm-kernel

On Thu, Apr 24, 2014 at 08:34:36AM -0300, Ezequiel Garcia wrote:
> HAVE_ARM_TWD depends on SMP, so we should only select it if
> SMP is enabled, as the others platforms do.
> 
> Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
> ---
>  arch/arm/mach-mvebu/Kconfig | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Applied to mvebu/soc

thx,

Jason.

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2014-04-26  0:46 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-04-24 11:34 [PATCH] ARM: mvebu: Select HAVE_ARM_TWD only if SMP is enabled Ezequiel Garcia
2014-04-25  2:18 ` Ezequiel Garcia
2014-04-25 21:26 ` Jason Cooper
2014-04-25 21:37   ` Ezequiel Garcia
2014-04-25 21:42     ` Jason Cooper
2014-04-26  0:46 ` Jason Cooper

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox