ARM: msm: fix compilation flags for MSM_SCM (part 2)
authorStephen Boyd <sboyd@codeaurora.org>
Tue, 1 May 2012 02:17:20 +0000 (19:17 -0700)
committerDavid Brown <davidb@codeaurora.org>
Fri, 11 May 2012 18:08:37 +0000 (11:08 -0700)
eca55f4 (ARM: msm: fix compilation flags for MSM_SCM, 2011-11-08)
added the correct assembler directive for the first smc instance
but missed the second instance in scm_get_version(). Add it so we
can compile this file with newer binutils.

Cc: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: David Brown <davidb@codeaurora.org>
arch/arm/mach-msm/scm.c

index bafabb5..c536fd6 100644 (file)
@@ -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)