aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/include/asm/ftrace.h
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-10-13 22:49:49 -0400
committerPaul Mundt <lethal@linux-sh.org>2009-10-13 22:49:49 -0400
commit36c871992697eaaf88a3682c2c3003a41c54b8c0 (patch)
treeff0206598be247ad883b411819db8c6decc5c5dc /arch/sh/include/asm/ftrace.h
parente4b053d96ae4e23e7023eb9f591bd7fc5c9c8cb9 (diff)
sh: Provide CALLER_ADDRx definitions even when ftrace is disabled.
Despite being located in the ftrace header, the CALLER_ADDRx definitions are used by generic code. As such, we have to provide it generically, and given that there is no real dependence on ftrace in the first place, the definitions can just be moved out. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/include/asm/ftrace.h')
-rw-r--r--arch/sh/include/asm/ftrace.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/sh/include/asm/ftrace.h b/arch/sh/include/asm/ftrace.h
index 28875a3e4116..13e9966464c2 100644
--- a/arch/sh/include/asm/ftrace.h
+++ b/arch/sh/include/asm/ftrace.h
@@ -32,6 +32,11 @@ static inline unsigned long ftrace_call_adjust(unsigned long addr)
32 return addr; 32 return addr;
33} 33}
34 34
35#endif /* __ASSEMBLY__ */
36#endif /* CONFIG_FUNCTION_TRACER */
37
38#ifndef __ASSEMBLY__
39
35/* arch/sh/kernel/return_address.c */ 40/* arch/sh/kernel/return_address.c */
36extern void *return_address(unsigned int); 41extern void *return_address(unsigned int);
37 42
@@ -46,6 +51,5 @@ extern void *return_address(unsigned int);
46#define CALLER_ADDR6 ((unsigned long)return_address(6)) 51#define CALLER_ADDR6 ((unsigned long)return_address(6))
47 52
48#endif /* __ASSEMBLY__ */ 53#endif /* __ASSEMBLY__ */
49#endif /* CONFIG_FUNCTION_TRACER */
50 54
51#endif /* __ASM_SH_FTRACE_H */ 55#endif /* __ASM_SH_FTRACE_H */