summaryrefslogtreecommitdiff
path: root/arch/arm/include/asm/ftrace.h
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/include/asm/ftrace.h')
-rw-r--r--arch/arm/include/asm/ftrace.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/include/asm/ftrace.h b/arch/arm/include/asm/ftrace.h
index 4a56a2ee067c..f89515adac60 100644
--- a/arch/arm/include/asm/ftrace.h
+++ b/arch/arm/include/asm/ftrace.h
@@ -18,7 +18,8 @@ struct dyn_arch_ftrace {
static inline unsigned long ftrace_call_adjust(unsigned long addr)
{
- return addr;
+ /* With Thumb-2, the recorded addresses have the lsb set */
+ return addr & ~1;
}
extern void ftrace_caller_old(void);