1 files changed, 4 insertions, 2 deletions

diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
index c7a8c208a45c..f5e75de0203e 100644
--- a/arch/arm/kernel/entry-common.S
+++ b/arch/arm/kernel/entry-common.S
@@ -167,7 +167,7 @@ ENTRY(__gnu_mcount_nc)
         stmdb   sp!, {r0-r3, lr}
         ldr     r0, =ftrace_trace_function
         ldr     r2, [r0]
-        adr     r0, ftrace_stub
+        adr     r0, .Lftrace_stub
         cmp     r0, r2
         bne     gnu_trace
         ldmia   sp!, {r0-r3, ip, lr}
@@ -177,8 +177,9 @@ gnu_trace:
         ldr     r1, [sp, #20]                   @ lr of instrumented routine
         mov     r0, lr
         sub     r0, r0, #MCOUNT_INSN_SIZE
-        mov     lr, pc
+        adr     lr, BSYM(1f)
         mov     pc, r2
+1:
         ldmia   sp!, {r0-r3, ip, lr}
         mov     pc, ip
 ENDPROC(__gnu_mcount_nc)
@@ -213,6 +214,7 @@ ENDPROC(mcount)
 #endif /* CONFIG_DYNAMIC_FTRACE */
 
 ENTRY(ftrace_stub)
+.Lftrace_stub:
         mov     pc, lr
 ENDPROC(ftrace_stub)