diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-11 04:26:12 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-11 04:26:12 -0500 |
| commit | e3f4e1cbc341bc2020241d8119bd078db3ec3b85 (patch) | |
| tree | 8b23624cc792f60d0bf86d787c3514cf0fb04418 /arch/sh/include/asm/ftrace.h | |
| parent | adfe67ddffbea51322b118896178bd71aaa4b4d8 (diff) | |
| parent | d71cb81af3817193bc605de061da0499934263a6 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'arch/sh/include/asm/ftrace.h')
| -rw-r--r-- | arch/sh/include/asm/ftrace.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/arch/sh/include/asm/ftrace.h b/arch/sh/include/asm/ftrace.h index 12f3a31f20af..13e9966464c2 100644 --- a/arch/sh/include/asm/ftrace.h +++ b/arch/sh/include/asm/ftrace.h | |||
| @@ -35,4 +35,21 @@ static inline unsigned long ftrace_call_adjust(unsigned long addr) | |||
| 35 | #endif /* __ASSEMBLY__ */ | 35 | #endif /* __ASSEMBLY__ */ |
| 36 | #endif /* CONFIG_FUNCTION_TRACER */ | 36 | #endif /* CONFIG_FUNCTION_TRACER */ |
| 37 | 37 | ||
| 38 | #ifndef __ASSEMBLY__ | ||
| 39 | |||
| 40 | /* arch/sh/kernel/return_address.c */ | ||
| 41 | extern void *return_address(unsigned int); | ||
| 42 | |||
| 43 | #define HAVE_ARCH_CALLER_ADDR | ||
| 44 | |||
| 45 | #define CALLER_ADDR0 ((unsigned long)__builtin_return_address(0)) | ||
| 46 | #define CALLER_ADDR1 ((unsigned long)return_address(1)) | ||
| 47 | #define CALLER_ADDR2 ((unsigned long)return_address(2)) | ||
| 48 | #define CALLER_ADDR3 ((unsigned long)return_address(3)) | ||
| 49 | #define CALLER_ADDR4 ((unsigned long)return_address(4)) | ||
| 50 | #define CALLER_ADDR5 ((unsigned long)return_address(5)) | ||
| 51 | #define CALLER_ADDR6 ((unsigned long)return_address(6)) | ||
| 52 | |||
| 53 | #endif /* __ASSEMBLY__ */ | ||
| 54 | |||
| 38 | #endif /* __ASM_SH_FTRACE_H */ | 55 | #endif /* __ASM_SH_FTRACE_H */ |