diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2012-04-30 19:17:20 -0700 |
|---|---|---|
| committer | David Brown <davidb@codeaurora.org> | 2012-05-11 11:08:37 -0700 |
| commit | 26e87b13834f04fc209e887f124e8ef4f3ca526c (patch) | |
| tree | eb430c5cf145a9290105e7aaca5ff2e7166fce8c /arch/arm/mach-msm/scm.c | |
| parent | 847ac9bf61301f4ce61b4baa3883efdff91d6fea (diff) | |
| download | olio-linux-3.10-26e87b13834f04fc209e887f124e8ef4f3ca526c.tar.xz olio-linux-3.10-26e87b13834f04fc209e887f124e8ef4f3ca526c.zip | |
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 <marc.zyngier@arm.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: David Brown <davidb@codeaurora.org>
Diffstat (limited to 'arch/arm/mach-msm/scm.c')
| -rw-r--r-- | arch/arm/mach-msm/scm.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-msm/scm.c b/arch/arm/mach-msm/scm.c index bafabb50258..c536fd6bf82 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) |