sh: Fix the value of MCOUNT_INSN_OFFSET
authorMatt Fleming <matt@console-pimps.org>
Sun, 28 Jun 2009 11:53:07 +0000 (12:53 +0100)
committerPaul Mundt <lethal@linux-sh.org>
Mon, 6 Jul 2009 10:52:08 +0000 (19:52 +0900)
It seems that MCOUNT_INSN_OFFSET was calculating the distance between
the wrong functions. The value that should have actually been computed
is the distance between ftrace_call and ftrace_stub. I discovered this
when I added some code to ftrace_caller.

Signed-off-by: Matt Fleming <matt@console-pimps.org>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
arch/sh/include/asm/ftrace.h

index 8fea7d8c8258946038bbc3a10cd25b8fa8675ab9..b09311ad1db395defc5773d922c3794813d80cdc 100644 (file)
@@ -11,10 +11,10 @@ extern void mcount(void);
 #define MCOUNT_ADDR            ((long)(mcount))
 
 #ifdef CONFIG_DYNAMIC_FTRACE
-#define CALLER_ADDR            ((long)(ftrace_caller))
+#define CALL_ADDR              ((long)(ftrace_call))
 #define STUB_ADDR              ((long)(ftrace_stub))
 
-#define MCOUNT_INSN_OFFSET     ((STUB_ADDR - CALLER_ADDR) >> 1)
+#define MCOUNT_INSN_OFFSET     ((STUB_ADDR - CALL_ADDR) - 4)
 
 struct dyn_arch_ftrace {
        /* No extra data needed on sh */