Dave, > -----Original Message----- > From: linaro-dev-bounces@xxxxxxxxxxxxxxxx [mailto:linaro-dev- > bounces@xxxxxxxxxxxxxxxx] On Behalf Of Dave Martin > Sent: Monday, December 06, 2010 11:06 PM > To: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx > Cc: Tony Lindgren; Dave Martin; linux-omap@xxxxxxxxxxxxxxx; linaro- > dev@xxxxxxxxxxxxxxxx > Subject: [PATCH v2 2/3] ARM: omap4: Correct definition of do_wfi() > forCONFIG_THUMB2_KERNEL > > For the Thumb-2 case, the "wfi" mnemonic is used, since in this > case the tools will necessarily be new enough to support it. > > Signed-off-by: Dave Martin <dave.martin@xxxxxxxxxx> > --- > KernelVersion: 2.6.37-rc4 The choice of opcode instead of instruction here was not because of toolchain. The problem was it breaks multi-omap build where ARMv6 and ARMv7 are build together. For this reason I NAK this patch. > > arch/arm/mach-omap2/include/mach/omap4-common.h | 5 +++++ > 1 files changed, 5 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/mach-omap2/include/mach/omap4-common.h > b/arch/arm/mach-omap2/include/mach/omap4-common.h > index 2744dfe..c6b1320 100644 > --- a/arch/arm/mach-omap2/include/mach/omap4-common.h > +++ b/arch/arm/mach-omap2/include/mach/omap4-common.h > @@ -17,8 +17,13 @@ > * wfi used in low power code. Directly opcode is used instead > * of instruction to avoid mulit-omap build break > */ > +#ifdef CONFIG_THUMB2_KERNEL > +#define do_wfi() \ > + __asm__ __volatile__ ("wfi" : : : "memory") > +#else > #define do_wfi() \ > __asm__ __volatile__ (".word 0xe320f003" : : : "memory") > +#endif > > #ifdef CONFIG_CACHE_L2X0 > extern void __iomem *l2cache_base; > -- > 1.7.1 > > > _______________________________________________ > linaro-dev mailing list > linaro-dev@xxxxxxxxxxxxxxxx > http://lists.linaro.org/mailman/listinfo/linaro-dev -- 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
