diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2011-11-08 13:07:36 +0000 |
|---|---|---|
| committer | David Brown <davidb@codeaurora.org> | 2011-11-08 08:58:28 -0800 |
| commit | eca55f4d9c1d918c2aa95fb8a73a34e2ba8a1b11 (patch) | |
| tree | 72f0aa283270bd13d34a928a75d37a1bcb618f47 /arch/arm/mach-msm | |
| parent | 47a6770ac6cd0d28f14dd9e1b17705abe6f05e41 (diff) | |
| download | linux-3.10-eca55f4d9c1d918c2aa95fb8a73a34e2ba8a1b11.tar.gz linux-3.10-eca55f4d9c1d918c2aa95fb8a73a34e2ba8a1b11.tar.bz2 linux-3.10-eca55f4d9c1d918c2aa95fb8a73a34e2ba8a1b11.zip | |
ARM: msm: fix compilation flags for MSM_SCM
CONFIG_MSM_SCM uses the smc instruction, which with some
toolchains requires a ".arch_extension" directive.
Cc: David Brown <davidb@codeaurora.org>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: David Brown <davidb@codeaurora.org>
Diffstat (limited to 'arch/arm/mach-msm')
| -rw-r--r-- | arch/arm/mach-msm/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/mach-msm/scm.c | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile index 4285dfd80b6..4ad3969b988 100644 --- a/arch/arm/mach-msm/Makefile +++ b/arch/arm/mach-msm/Makefile @@ -15,6 +15,8 @@ obj-$(CONFIG_MSM_SMD) += smd.o smd_debug.o obj-$(CONFIG_MSM_SMD) += last_radio_log.o obj-$(CONFIG_MSM_SCM) += scm.o scm-boot.o +CFLAGS_scm.o :=$(call as-instr,.arch_extension sec,-DREQUIRES_SEC=1) + obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o obj-$(CONFIG_SMP) += headsmp.o platsmp.o diff --git a/arch/arm/mach-msm/scm.c b/arch/arm/mach-msm/scm.c index 232f97a0450..bafabb50258 100644 --- 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) |