Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36c87199 authored by Paul Mundt's avatar Paul Mundt
Browse files

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: default avatarPaul Mundt <lethal@linux-sh.org>
parent e4b053d9

arch/sh/include/asm/ftrace.h

+5 −1
Original line number Diff line number Diff line
@@ -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 */