renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-26 14:14:01 +08:00
Code

msm: scm: Fix improper register assignment

Browse Source 
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>
This commit is contained in:
Stephen Boyd 2011-02-24 10:44:43 -08:00 committed by David Brown
parent 7e1a68abae
commit 98d4ded60b
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm/mach-msm/scm.c
View File

@ -264,13 +264,16 @@ u32 scm_get_version(void)
{ {
int context_id; int context_id;
static u32 version = -1; static u32 version = -1;
register u32 r0 asm("r0") = 0x1 << 8; register u32 r0 asm("r0");
register u32 r1 asm("r1") = (u32)&context_id; register u32 r1 asm("r1");
if (version != -1) if (version != -1)
return version; return version;
mutex_lock(&scm_lock); mutex_lock(&scm_lock);
r0 = 0x1 << 8;
r1 = (u32)&context_id;
asm volatile( asm volatile(
__asmeq("%0", "r1") __asmeq("%0", "r1")
__asmeq("%1", "r0") __asmeq("%1", "r0")