From 98d4ded60bda17a9ffecd902b03deac52922b788 Mon Sep 17 00:00:00 2001 From: Stephen Boyd Date: Thu, 24 Feb 2011 10:44:43 -0800 Subject: [PATCH] msm: scm: Fix improper register assignment Assign the registers used in the inline assembly immediately before the inline assembly block. This ensures the compiler doesn't optimize away dead register assignments when it shouldn't. Signed-off-by: Stephen Boyd Acked-by: Nicolas Pitre Signed-off-by: David Brown --- arch/arm/mach-msm/scm.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-msm/scm.c b/arch/arm/mach-msm/scm.c index ba57b5adf873..5eddf549717a 100644 --- a/arch/arm/mach-msm/scm.c +++ b/arch/arm/mach-msm/scm.c @@ -264,13 +264,16 @@ u32 scm_get_version(void) { int context_id; static u32 version = -1; - register u32 r0 asm("r0") = 0x1 << 8; - register u32 r1 asm("r1") = (u32)&context_id; + register u32 r0 asm("r0"); + register u32 r1 asm("r1"); if (version != -1) return version; mutex_lock(&scm_lock); + + r0 = 0x1 << 8; + r1 = (u32)&context_id; asm volatile( __asmeq("%0", "r1") __asmeq("%1", "r0")