| Message ID | 1398339276-5754-1-git-send-email-ezequiel.garcia@free-electrons.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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?
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@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/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.
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.
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.
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
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(-)