diff options
| author | Will Deacon <will.deacon@arm.com> | 2014-05-28 21:29:23 +0400 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2014-05-28 21:29:23 +0400 |
| commit | 2eb8b396dc6ecf797925cc6bad4c0c6dfbdf4d44 (patch) | |
| tree | de062b67715e1eb0321032ad2a87f12cb664643b /arch/arm/include/asm/ftrace.h | |
| parent | af885f4022622331f17227dfcfbb2dafdee25a43 (diff) | |
| parent | eed542d6962ba33a689b4007a389f466e407bd74 (diff) | |
| download | linux-2eb8b396dc6ecf797925cc6bad4c0c6dfbdf4d44.tar.xz | |
Merge branch 'ftrace/arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into for-next/core
Core ftrace changes from Steve Rostedt, required by the arm64 support
code.
Diffstat (limited to 'arch/arm/include/asm/ftrace.h')
| -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 f89515adac60..eb577f4f5f70 100644 --- a/arch/arm/include/asm/ftrace.h +++ b/arch/arm/include/asm/ftrace.h @@ -52,15 +52,7 @@ extern 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__ */ |