Merge branch 'for-linus-v3.20' of git://git.infradead.org/linux-ubifs

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

diff --git a/arch/s390/kernel/mcount.S b/arch/s390/kernel/mcount.S
index b6dfc5bfcb892227407302def2c35963f450cae0..e499370fbccb328561e6ef5ab0bfe35afb4a0b51 100644 (file)
--- a/arch/s390/kernel/mcount.S
+++ b/arch/s390/kernel/mcount.S
@@ -27,7 +27,9 @@ ENTRY(ftrace_caller)
        .globl  ftrace_regs_caller
        .set    ftrace_regs_caller,ftrace_caller
        lgr     %r1,%r15
+#ifndef CC_USING_HOTPATCH
        aghi    %r0,MCOUNT_RETURN_FIXUP
+#endif
        aghi    %r15,-STACK_FRAME_SIZE
        stg     %r1,__SF_BACKCHAIN(%r15)
        stg     %r1,(STACK_PTREGS_GPRS+15*8)(%r15)