diff options
author | AKASHI Takahiro <takahiro.akashi@linaro.org> | 2014-04-30 18:54:29 +0900 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2014-06-04 17:54:14 +0800 |
commit | de8e380b1f7ba30ba9e6515b959bab2eef87ae3b (patch) | |
tree | 8d319d5e05b1055087d7af0bdda9044260cc80ec /arch/parisc | |
parent | ab6c58757483ffa92d3da4b3d2672f6acfc3adf2 (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/parisc')
-rw-r--r-- | arch/parisc/include/asm/ftrace.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/arch/parisc/include/asm/ftrace.h b/arch/parisc/include/asm/ftrace.h index 72c0fafaa039..544ed8ef87eb 100644 --- a/arch/parisc/include/asm/ftrace.h +++ b/arch/parisc/include/asm/ftrace.h @@ -24,15 +24,7 @@ extern void return_to_handler(void); extern unsigned long return_address(unsigned int); -#define HAVE_ARCH_CALLER_ADDR - -#define CALLER_ADDR0 ((unsigned long)__builtin_return_address(0)) -#define CALLER_ADDR1 return_address(1) -#define CALLER_ADDR2 return_address(2) -#define CALLER_ADDR3 return_address(3) -#define CALLER_ADDR4 return_address(4) -#define CALLER_ADDR5 return_address(5) -#define CALLER_ADDR6 return_address(6) +#define ftrace_return_address(n) return_address(n) #endif /* __ASSEMBLY__ */ |