diff options
| author | AKASHI Takahiro <takahiro.akashi@linaro.org> | 2014-04-30 18:54:29 +0900 |
|---|---|---|
| committer | Show Liu <show.liu@linaro.org> | 2014-06-18 12:04:07 +0800 |
| commit | 07b7bcba912fde8d87a6c81f38eb5b59fada93c9 (patch) | |
| tree | a6b6cd3389960512fd9c2766663f28fb25a9ef32 /arch/arm/include | |
| parent | 92b0f71a73b09831a1224eac8e6d1f14f796b9c7 (diff) | |
ftrace: make CALLER_ADDRx macros more generic
Most archs with HAVE_ARCH_CALLER_ADDR have the almost same definitions
of CALLER_ADDRx(n), and so put them into linux/ftrace.h.
Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
(cherry picked from LSK commit f2f646bdd599cb551bfeb8f1934a9e14ccfeac84)
Signed-off-by: Alex Shi <alex.shi@linaro.org>
Conflicts:
arch/xtensa/include/asm/ftrace.h
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/ftrace.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/arch/arm/include/asm/ftrace.h b/arch/arm/include/asm/ftrace.h index 2bb8cac28b9..bca6f7fecd9 100644 --- a/arch/arm/include/asm/ftrace.h +++ b/arch/arm/include/asm/ftrace.h @@ -52,15 +52,7 @@ static inline void *return_address(unsigned int level) #endif -#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_addr(n) return_address(n) #endif /* ifndef __ASSEMBLY__ */ |