aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/include
diff options
context:
space:
mode:
authorMartin Schwidefsky <schwidefsky@de.ibm.com>2011-05-10 10:10:43 +0200
committerSteven Rostedt <rostedt@goodmis.org>2011-05-16 15:05:06 -0400
commitf29638868280534ed7e2fdd93b31557232597940 (patch)
treedf11bf6f18442c29b5c76566560e8874c040d9d4 /arch/s390/include
parent521ccb5c4aece609311bfa7157910a8f0c942af5 (diff)
downloadkernel_samsung_smdk4412-f29638868280534ed7e2fdd93b31557232597940.zip
kernel_samsung_smdk4412-f29638868280534ed7e2fdd93b31557232597940.tar.gz
kernel_samsung_smdk4412-f29638868280534ed7e2fdd93b31557232597940.tar.bz2
ftrace/s390: mcount offset calculation
Do the mcount offset adjustment in the recordmcount.pl/recordmcount.[ch] at compile time and not in ftrace_call_adjust at run time. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'arch/s390/include')
-rw-r--r--arch/s390/include/asm/ftrace.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/s390/include/asm/ftrace.h b/arch/s390/include/asm/ftrace.h
index 3c29be4..b7931fa 100644
--- a/arch/s390/include/asm/ftrace.h
+++ b/arch/s390/include/asm/ftrace.h
@@ -11,15 +11,13 @@ struct dyn_arch_ftrace { };
#ifdef CONFIG_64BIT
#define MCOUNT_INSN_SIZE 12
-#define MCOUNT_OFFSET 8
#else
#define MCOUNT_INSN_SIZE 20
-#define MCOUNT_OFFSET 4
#endif
static inline unsigned long ftrace_call_adjust(unsigned long addr)
{
- return addr - MCOUNT_OFFSET;
+ return addr;
}
#endif /* __ASSEMBLY__ */