From 7e1a68abaef094d5927ffe76bce21d6d8aa87bcb Mon Sep 17 00:00:00 2001 From: Stephen Boyd Date: Thu, 24 Feb 2011 10:44:42 -0800 Subject: msm: scm: Mark inline asm as volatile We don't want the compiler to remove these asm statements or reorder them in any way. Mark them as volatile to be sure. Signed-off-by: Stephen Boyd Acked-by: Will Deacon Signed-off-by: David Brown --- arch/arm/mach-msm/scm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'arch/arm/mach-msm') diff --git a/arch/arm/mach-msm/scm.c b/arch/arm/mach-msm/scm.c index f4b9bc90d6a7..ba57b5adf873 100644 --- a/arch/arm/mach-msm/scm.c +++ b/arch/arm/mach-msm/scm.c @@ -174,7 +174,7 @@ static u32 smc(u32 cmd_addr) register u32 r0 asm("r0") = 1; register u32 r1 asm("r1") = (u32)&context_id; register u32 r2 asm("r2") = cmd_addr; - asm( + asm volatile( __asmeq("%0", "r0") __asmeq("%1", "r0") __asmeq("%2", "r1") @@ -271,7 +271,7 @@ u32 scm_get_version(void) return version; mutex_lock(&scm_lock); - asm( + asm volatile( __asmeq("%0", "r1") __asmeq("%1", "r0") __asmeq("%2", "r1") -- cgit v1.2.3