Merge tag 's390-6.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[linux-block.git] / arch / s390 / kernel / mcount.S

diff --git a/arch/s390/kernel/mcount.S b/arch/s390/kernel/mcount.S
index a7902fdb7ba292c791bc325e43cd06f98b71a03e..dbece2803c50bd03d7e03d5b4c41f3b349ad8eb8 100644 (file)
--- a/arch/s390/kernel/mcount.S
+++ b/arch/s390/kernel/mcount.S
@@ -32,6 +32,11 @@ SYM_FUNC_START(ftrace_stub)
        BR_EX   %r14
 SYM_FUNC_END(ftrace_stub)
 
+SYM_CODE_START(ftrace_stub_direct_tramp)
+       lgr     %r1, %r0
+       BR_EX   %r1
+SYM_CODE_END(ftrace_stub_direct_tramp)
+
        .macro  ftrace_regs_entry, allregs=0
        stg     %r14,(__SF_GPRS+8*8)(%r15)      # save traced function caller