diff options
| author | Olof Johansson <olof@lixom.net> | 2011-11-09 17:02:13 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2011-11-09 17:02:13 -0800 |
| commit | 3cdc3acc62527ab9544c2820b5e5da482a105240 (patch) | |
| tree | 72e204d29562c5233517d5b84cbe72dd3e5d213b /arch/arm/mach-msm/scm.c | |
| parent | 3c52b2be1804ed553df8df47213b58fedc93c5ab (diff) | |
| parent | eca55f4d9c1d918c2aa95fb8a73a34e2ba8a1b11 (diff) | |
Merge branch 'msm-fix' of git://codeaurora.org/quic/kernel/davidb/linux-msm into fixes
Diffstat (limited to 'arch/arm/mach-msm/scm.c')
| -rw-r--r-- | arch/arm/mach-msm/scm.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-msm/scm.c b/arch/arm/mach-msm/scm.c index 232f97a0450..bafabb50258 100644 --- a/arch/arm/mach-msm/scm.c +++ b/arch/arm/mach-msm/scm.c @@ -180,6 +180,9 @@ static u32 smc(u32 cmd_addr) __asmeq("%1", "r0") __asmeq("%2", "r1") __asmeq("%3", "r2") +#ifdef REQUIRES_SEC + ".arch_extension sec\n" +#endif "smc #0 @ switch to secure world\n" : "=r" (r0) : "r" (r0), "r" (r1), "r" (r2) |