From 8f893448a9767d0a6a513eed6ca5781a05e52e16 Mon Sep 17 00:00:00 2001
From: Stephen Boyd <sboyd@codeaurora.org>
Date: Mon, 30 Apr 2012 19:17:20 -0700
Subject: [PATCH] --- yaml --- r: 303080 b: refs/heads/master c:
 26e87b13834f04fc209e887f124e8ef4f3ca526c h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/arch/arm/mach-msm/scm.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d6aa844e3748..06f6dc95046e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 847ac9bf61301f4ce61b4baa3883efdff91d6fea
+refs/heads/master: 26e87b13834f04fc209e887f124e8ef4f3ca526c
diff --git a/trunk/arch/arm/mach-msm/scm.c b/trunk/arch/arm/mach-msm/scm.c
index bafabb502580..c536fd6bf827 100644
--- a/trunk/arch/arm/mach-msm/scm.c
+++ b/trunk/arch/arm/mach-msm/scm.c
@@ -282,6 +282,9 @@ u32 scm_get_version(void)
 			__asmeq("%1", "r1")
 			__asmeq("%2", "r0")
 			__asmeq("%3", "r1")
+#ifdef REQUIRES_SEC
+			".arch_extension sec\n"
+#endif
 			"smc	#0	@ switch to secure world\n"
 			: "=r" (r0), "=r" (r1)
 			: "r" (r0), "r" (r1)