diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2011-02-24 19:44:42 +0100 |
|---|---|---|
| committer | David Brown <davidb@codeaurora.org> | 2011-03-10 21:01:37 +0100 |
| commit | 7e1a68abaef094d5927ffe76bce21d6d8aa87bcb (patch) | |
| tree | 0634cfbfad54311587d99e46ebec9b4533bf1793 /arch/arm/mach-msm | |
| parent | msm: iommu: Enable HTW L2 redirection on MSM8960 (diff) | |
| download | linux-7e1a68abaef094d5927ffe76bce21d6d8aa87bcb.tar.xz linux-7e1a68abaef094d5927ffe76bce21d6d8aa87bcb.zip | |
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 <sboyd@codeaurora.org>
Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: David Brown <davidb@codeaurora.org>
Diffstat (limited to 'arch/arm/mach-msm')
| -rw-r--r-- | arch/arm/mach-msm/scm.c | 4 |
1 files changed, 2 insertions, 2 deletions
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") |