projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'lsk/v3.10/topic/gator' into linux-linaro-lsk
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
include
/
asm
/
ftrace.h
diff --git
a/arch/arm/include/asm/ftrace.h
b/arch/arm/include/asm/ftrace.h
index eb577f4f5f7096517e803946755d562f98161743..39eb16b0066f2e4acb7464f1a3766fba9c7ddeeb 100644
(file)
--- a/
arch/arm/include/asm/ftrace.h
+++ b/
arch/arm/include/asm/ftrace.h
@@
-52,7
+52,7
@@
extern inline void *return_address(unsigned int level)
#endif
-#define ftrace_return_addr(n) return_address(n)
+#define ftrace_return_addr
ess
(n) return_address(n)
#endif /* ifndef __ASSEMBLY__ */