diff options
| author | Steve French <sfrench@us.ibm.com> | 2011-12-16 01:39:20 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2011-12-16 01:39:20 -0500 |
| commit | aaf015890754d58dcb71a4aa44ed246bb082bcf6 (patch) | |
| tree | 17b51ff707fd1b3efec3a3ab872f0d7a7416aca5 /arch/arm/mach-msm/scm.c | |
| parent | 9c32c63bb70b2fafc3b18bee29959c3bf245ceba (diff) | |
| parent | 8def5f51b012efb00e77ba2d04696cc0aadd0609 (diff) | |
Merge branch 'master' of git+ssh://git.samba.org/data/git/sfrench/cifs-2.6
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 232f97a04504..bafabb502580 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) | |||
| 180 | __asmeq("%1", "r0") | 180 | __asmeq("%1", "r0") |
| 181 | __asmeq("%2", "r1") | 181 | __asmeq("%2", "r1") |
| 182 | __asmeq("%3", "r2") | 182 | __asmeq("%3", "r2") |
| 183 | #ifdef REQUIRES_SEC | ||
| 184 | ".arch_extension sec\n" | ||
| 185 | #endif | ||
| 183 | "smc #0 @ switch to secure world\n" | 186 | "smc #0 @ switch to secure world\n" |
| 184 | : "=r" (r0) | 187 | : "=r" (r0) |
| 185 | : "r" (r0), "r" (r1), "r" (r2) | 188 | : "r" (r0), "r" (r1), "r" (r2) |