From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Boyd Subject: [PATCH] ARM: msm: fix compilation flags for MSM_SCM (part 2) Date: Mon, 30 Apr 2012 19:17:20 -0700 Message-ID: <1335838640-11176-1-git-send-email-sboyd@codeaurora.org> Return-path: Received: from wolverine01.qualcomm.com ([199.106.114.254]:8342 "EHLO wolverine01.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757099Ab2EACRX (ORCPT ); Mon, 30 Apr 2012 22:17:23 -0400 Sender: linux-arm-msm-owner@vger.kernel.org List-Id: linux-arm-msm@vger.kernel.org To: David Brown Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Marc Zyngier 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 --- 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 bafabb5..c536fd6 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) -- Sent by an employee of the Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.