summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@codeaurora.org>2011-02-24 10:44:43 -0800
committerDavid Brown <davidb@codeaurora.org>2011-03-10 12:01:37 -0800
commit98d4ded60bda17a9ffecd902b03deac52922b788 (patch)
tree62cc7c393d8d560fbb7bcbe9d29071b3215107b8
parent7e1a68abaef094d5927ffe76bce21d6d8aa87bcb (diff)
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 <sboyd@codeaurora.org> Acked-by: Nicolas Pitre <nico@fluxnic.net> Signed-off-by: David Brown <davidb@codeaurora.org>
-rw-r--r--arch/arm/mach-msm/scm.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/mach-msm/scm.c b/arch/arm/mach-msm/scm.c
index ba57b5adf87..5eddf549717 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")