From 26e87b13834f04fc209e887f124e8ef4f3ca526c Mon Sep 17 00:00:00 2001 From: Stephen Boyd Date: Mon, 30 Apr 2012 19:17:20 -0700 Subject: [PATCH] ARM: msm: fix compilation flags for MSM_SCM (part 2) 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 Signed-off-by: Stephen Boyd Signed-off-by: David Brown --- arch/arm/mach-msm/scm.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm/mach-msm/scm.c b/arch/arm/mach-msm/scm.c index bafabb502580..c536fd6bf827 100644 --- a/arch/arm/mach-msm/scm.c +++ b/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)