diff options
| author | Mark Brown <broonie@linaro.org> | 2014-05-30 18:19:45 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-05-30 18:19:45 +0100 |
| commit | 9e2da0c5c819d6336b957c9b538f36f9b15092b4 (patch) | |
| tree | 16aa77af0ca7a04c0f6d504d0a368f2bee9b208b /arch/sh/include | |
| parent | 8b7c6acc380791db69f90f37908595cef21f7c6a (diff) | |
| parent | 25210066633a868e52dc23f680111b23b974eba3 (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Diffstat (limited to 'arch/sh/include')
| -rw-r--r-- | arch/sh/include/asm/ftrace.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/arch/sh/include/asm/ftrace.h b/arch/sh/include/asm/ftrace.h index 13e9966464c2..e79fb6ebaa42 100644 --- a/arch/sh/include/asm/ftrace.h +++ b/arch/sh/include/asm/ftrace.h @@ -40,15 +40,7 @@ static inline unsigned long ftrace_call_adjust(unsigned long addr) /* arch/sh/kernel/return_address.c */ extern void *return_address(unsigned int); -#define HAVE_ARCH_CALLER_ADDR - -#define CALLER_ADDR0 ((unsigned long)__builtin_return_address(0)) -#define CALLER_ADDR1 ((unsigned long)return_address(1)) -#define CALLER_ADDR2 ((unsigned long)return_address(2)) -#define CALLER_ADDR3 ((unsigned long)return_address(3)) -#define CALLER_ADDR4 ((unsigned long)return_address(4)) -#define CALLER_ADDR5 ((unsigned long)return_address(5)) -#define CALLER_ADDR6 ((unsigned long)return_address(6)) +#define ftrace_return_address(n) return_address(n) #endif /* __ASSEMBLY__ */ |