diff mbox

[v2,1/5] ARM: omap4: Correct definition of do_wfi() for CONFIG_THUMB2_KERNEL

Message ID 1296756161-26092-2-git-send-email-dave.martin@linaro.org (mailing list archive)
State Superseded
Delegated to: Kevin Hilman
Headers show

Commit Message

tip-bot for Dave Martin Feb. 3, 2011, 6:02 p.m. UTC 
None
diff mbox

Patch

diff --git a/arch/arm/mach-omap2/include/mach/omap4-common.h b/arch/arm/mach-omap2/include/mach/omap4-common.h
index 5b0270b..68ce058 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;