| Message ID | 5583214.HuX5EZ5Unx@wuerfel (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 9ce3fa6816c2fb59d128248c9b0509aef1c5dae7 |
| Delegated to: | Simon Horman |
| Headers | show |
On Tue, Nov 11, 2014 at 7:27 PM, Arnd Bergmann <arnd@arndb.de> wrote: > On Tuesday 04 November 2014 10:50:08 Simon Horman wrote: >> From: Ulrich Hecht <ulrich.hecht+renesas@gmail.com> >> >> On E2, the arch timer is hooked up to a different clock, and the CA7's arch >> timer CNTVOFF register must be initialized. >> >> Based on work by Hisashi Nakamura. >> >> Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com> >> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > > This is one of the patches that broke allmodconfig in linux-next. > > Can you apply the patch below before sending it to arm-soc? > > Thanks, > > Arnd > > --- > From 8bf0a4cae3137411498ff23ca46f693e4c22a25b Mon Sep 17 00:00:00 2001 > From: Arnd Bergmann <arnd@arndb.de> > Date: Tue, 11 Nov 2014 16:36:50 +0100 > Subject: [PATCH] ARM: shmobile: always build rcar setup for armv7 > > In a combined ARMv6/v7 kernel, the setup-rcar-gen2.c cannot > currently be compiled correctly because it uses the isb > instruction that is not available on ARMv6. Adding the > -march=armv7-a flag lets the compiler know that it is safe > to build this file for ARMv7. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Thanks, this is a better solution than "[RFT] ARM: shmobile: rcar-gen2: Fix build breakage" (https://lkml.org/lkml/2014/10/31/338). Acked-by: Geert Uytterhoeven <geert+renesas@glider.be> Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Nov 11, 2014 at 08:00:26PM +0100, Geert Uytterhoeven wrote: > On Tue, Nov 11, 2014 at 7:27 PM, Arnd Bergmann <arnd@arndb.de> wrote: > > On Tuesday 04 November 2014 10:50:08 Simon Horman wrote: > >> From: Ulrich Hecht <ulrich.hecht+renesas@gmail.com> > >> > >> On E2, the arch timer is hooked up to a different clock, and the CA7's arch > >> timer CNTVOFF register must be initialized. > >> > >> Based on work by Hisashi Nakamura. > >> > >> Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com> > >> Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > > > > This is one of the patches that broke allmodconfig in linux-next. > > > > Can you apply the patch below before sending it to arm-soc? > > > > Thanks, > > > > Arnd > > > > --- > > From 8bf0a4cae3137411498ff23ca46f693e4c22a25b Mon Sep 17 00:00:00 2001 > > From: Arnd Bergmann <arnd@arndb.de> > > Date: Tue, 11 Nov 2014 16:36:50 +0100 > > Subject: [PATCH] ARM: shmobile: always build rcar setup for armv7 > > > > In a combined ARMv6/v7 kernel, the setup-rcar-gen2.c cannot > > currently be compiled correctly because it uses the isb > > instruction that is not available on ARMv6. Adding the > > -march=armv7-a flag lets the compiler know that it is safe > > to build this file for ARMv7. > > > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > Thanks, this is a better solution than "[RFT] ARM: shmobile: rcar-gen2: > Fix build breakage" (https://lkml.org/lkml/2014/10/31/338). > > Acked-by: Geert Uytterhoeven <geert+renesas@glider.be> Agreed. Acked-by: Simon Horman <horms+renesas@verge.net.au> Arnd, what is the best way to get this patch merged? Do you plan to take it or should I? -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wednesday 12 November 2014 08:59:55 Simon Horman wrote: > > > From 8bf0a4cae3137411498ff23ca46f693e4c22a25b Mon Sep 17 00:00:00 2001 > > > From: Arnd Bergmann <arnd@arndb.de> > > > Date: Tue, 11 Nov 2014 16:36:50 +0100 > > > Subject: [PATCH] ARM: shmobile: always build rcar setup for armv7 > > > > > > In a combined ARMv6/v7 kernel, the setup-rcar-gen2.c cannot > > > currently be compiled correctly because it uses the isb > > > instruction that is not available on ARMv6. Adding the > > > -march=armv7-a flag lets the compiler know that it is safe > > > to build this file for ARMv7. > > > > > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > > > Thanks, this is a better solution than "[RFT] ARM: shmobile: rcar-gen2: > > Fix build breakage" (https://lkml.org/lkml/2014/10/31/338). > > > > Acked-by: Geert Uytterhoeven <geert+renesas@glider.be> > > Agreed. > > Acked-by: Simon Horman <horms+renesas@verge.net.au> > > Arnd, what is the best way to get this patch merged? > Do you plan to take it or should I? I believe the problem only exists in your tree at the moment, not in arm-soc, so please apply it on top of the branch that introduced the build error before sending it to arm-soc. If you have already sent a pull request but we haven't taken it yet, send an updated pull request that adds this patch. Arnd -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Nov 12, 2014 at 09:53:45AM +0100, Arnd Bergmann wrote: > On Wednesday 12 November 2014 08:59:55 Simon Horman wrote: > > > > From 8bf0a4cae3137411498ff23ca46f693e4c22a25b Mon Sep 17 00:00:00 2001 > > > > From: Arnd Bergmann <arnd@arndb.de> > > > > Date: Tue, 11 Nov 2014 16:36:50 +0100 > > > > Subject: [PATCH] ARM: shmobile: always build rcar setup for armv7 > > > > > > > > In a combined ARMv6/v7 kernel, the setup-rcar-gen2.c cannot > > > > currently be compiled correctly because it uses the isb > > > > instruction that is not available on ARMv6. Adding the > > > > -march=armv7-a flag lets the compiler know that it is safe > > > > to build this file for ARMv7. > > > > > > > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > > > > > Thanks, this is a better solution than "[RFT] ARM: shmobile: rcar-gen2: > > > Fix build breakage" (https://lkml.org/lkml/2014/10/31/338). > > > > > > Acked-by: Geert Uytterhoeven <geert+renesas@glider.be> > > > > Agreed. > > > > Acked-by: Simon Horman <horms+renesas@verge.net.au> > > > > Arnd, what is the best way to get this patch merged? > > Do you plan to take it or should I? > > I believe the problem only exists in your tree at the moment, not in arm-soc, > so please apply it on top of the branch that introduced the build error > before sending it to arm-soc. If you have already sent a pull request > but we haven't taken it yet, send an updated pull request that adds > this patch. Sure, will do. -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile index 7d68eba53be3..b55cac0e5b2b 100644 --- a/arch/arm/mach-shmobile/Makefile +++ b/arch/arm/mach-shmobile/Makefile @@ -35,6 +35,7 @@ cpu-y := platsmp.o headsmp.o # Shared SoC family objects obj-$(CONFIG_ARCH_RCAR_GEN2) += setup-rcar-gen2.o platsmp-apmu.o $(cpu-y) +CFLAGS_setup-rcar-gen2.o += -march=armv7-a # SMP objects smp-y := $(cpu-y)