diff options
author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-02-23 10:08:33 -0500 |
---|---|---|
committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-02-23 10:08:33 -0500 |
commit | a010ae86cc27ef660afdcc7e7d4cdbc2b38fce09 (patch) | |
tree | 50fb5ee861b3b0e79e31529f3bebb67baf12b7af /arch/arm/mach-omap2/include/mach/omap4-common.h | |
parent | 239a14a340ad4a81cfff4075625382d7f78f5258 (diff) | |
parent | 4760195df00982b4e388e859b41a63feed6d0cab (diff) |
Merge branch 'for-linaro-2.6.38/dirty/arm/omap-thumb2+merged' of git://git.linaro.org/people/dmart/linux-2.6-arm into linaro-2.6.38linaro-linux-2.6.38-upstream-23Feb2011
Diffstat (limited to 'arch/arm/mach-omap2/include/mach/omap4-common.h')
-rw-r--r-- | arch/arm/mach-omap2/include/mach/omap4-common.h | 4 |
1 files changed, 4 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 5b0270b2893..de441c05a6a 100644 --- a/arch/arm/mach-omap2/include/mach/omap4-common.h +++ b/arch/arm/mach-omap2/include/mach/omap4-common.h @@ -17,8 +17,12 @@ * 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; |