git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fix' of git://github.com/ycmiao/pxa-linux into fixes
[pandora-kernel.git]
/
arch
/
arm
/
mach-msm
/
scm.c
diff --git
a/arch/arm/mach-msm/scm.c
b/arch/arm/mach-msm/scm.c
index
232f97a
..
bafabb5
100644
(file)
--- 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)