From eb40ed35ff20ad67481540114307f04b10e54e0b Mon Sep 17 00:00:00 2001 From: John Kirk Date: Mon, 1 Oct 2012 14:43:43 -0600 Subject: [PATCH] fix scm.c to make properly with all tool versions --- arch/arm/mach-msm/scm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-msm/scm.c b/arch/arm/mach-msm/scm.c index cdb0cbeb..43d0861a 100755 --- a/arch/arm/mach-msm/scm.c +++ b/arch/arm/mach-msm/scm.c @@ -173,7 +173,7 @@ static u32 smc(u32 cmd_addr) __asmeq("%1", "r0") __asmeq("%2", "r1") __asmeq("%3", "r2") - "smc #0 @ switch to secure world\n" + ".arch_extension sec\n smc #0 @ switch to secure world\n" : "=r" (r0) : "r" (r0), "r" (r1), "r" (r2) : "r3"); @@ -294,7 +294,7 @@ s32 scm_call_atomic1(u32 svc, u32 cmd, u32 arg1) __asmeq("%1", "r0") __asmeq("%2", "r1") __asmeq("%3", "r2") - "smc #0 @ switch to secure world\n" + ".arch_extension sec\n smc #0 @ switch to secure world\n" : "=r" (r0) : "r" (r0), "r" (r1), "r" (r2) : "r3"); @@ -326,7 +326,7 @@ s32 scm_call_atomic2(u32 svc, u32 cmd, u32 arg1, u32 arg2) __asmeq("%2", "r1") __asmeq("%3", "r2") __asmeq("%4", "r3") - "smc #0 @ switch to secure world\n" + ".arch_extension sec\n smc #0 @ switch to secure world\n" : "=r" (r0) : "r" (r0), "r" (r1), "r" (r2), "r" (r3)); return r0; @@ -353,7 +353,7 @@ s32 scm_call_atomic4_3(u32 svc, u32 cmd, u32 arg1, u32 arg2, __asmeq("%4", "r1") __asmeq("%5", "r2") __asmeq("%6", "r3") - "smc #0 @ switch to secure world\n" + ".arch_extension sec\n smc #0 @ switch to secure world\n" : "=r" (r0), "=r" (r1), "=r" (r2) : "r" (r0), "r" (r1), "r" (r2), "r" (r3), "r" (r4), "r" (r5)); ret = r0; @@ -385,7 +385,7 @@ u32 scm_get_version(void) __asmeq("%1", "r1") __asmeq("%2", "r0") __asmeq("%3", "r1") - "smc #0 @ switch to secure world\n" + ".arch_extension sec\n smc #0 @ switch to secure world\n" : "=r" (r0), "=r" (r1) : "r" (r0), "r" (r1) : "r2", "r3");