diff options
| author | Matt Fleming <matt@console-pimps.org> | 2009-06-28 13:53:07 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-07-06 12:52:08 +0200 |
| commit | ca0d17277fd101ce4878f92b398b6ab71fb2c287 (patch) | |
| tree | f83251b45da79383d67810885553137a95633da7 /arch/sh/include | |
| parent | Linux 2.6.31-rc2 (diff) | |
| download | linux-ca0d17277fd101ce4878f92b398b6ab71fb2c287.tar.xz linux-ca0d17277fd101ce4878f92b398b6ab71fb2c287.zip | |
sh: Fix the value of MCOUNT_INSN_OFFSET
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>
Diffstat (limited to 'arch/sh/include')
| -rw-r--r-- | arch/sh/include/asm/ftrace.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/include/asm/ftrace.h b/arch/sh/include/asm/ftrace.h index 8fea7d8c8258..b09311ad1db3 100644 --- a/arch/sh/include/asm/ftrace.h +++ b/arch/sh/include/asm/ftrace.h @@ -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 */ |