From 36c871992697eaaf88a3682c2c3003a41c54b8c0 Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Wed, 14 Oct 2009 11:49:49 +0900 Subject: [PATCH] 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 --- arch/sh/include/asm/ftrace.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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) return addr; } +#endif /* __ASSEMBLY__ */ +#endif /* CONFIG_FUNCTION_TRACER */ + +#ifndef __ASSEMBLY__ + /* arch/sh/kernel/return_address.c */ extern void *return_address(unsigned int); @@ -46,6 +51,5 @@ extern void *return_address(unsigned int); #define CALLER_ADDR6 ((unsigned long)return_address(6)) #endif /* __ASSEMBLY__ */ -#endif /* CONFIG_FUNCTION_TRACER */ #endif /* __ASM_SH_FTRACE_H */