| Message ID | 20191107160840.7bd821dc@xhacker.debian (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 1a70cf0e7ee6e73aa29c2dd4dd8d3d38c48d5946 |
| Headers | show |
| Series | [RESEND,v3] ARM: ftrace: remove mcount(),ftrace_caller_old() and ftrace_call_old() | expand |
On Thu, 7 Nov 2019 08:21:42 +0000 Jisheng Zhang <Jisheng.Zhang@synaptics.com> wrote: > Commit d3c61619568c ("ARM: 8788/1: ftrace: remove old mcount support") > removed the old mcount support, but forget to remove these three > declarations. This patch removes them. > > Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com> Acked-by: Steven Rostedt (VMware) <rostedt@goodmis.org> -- Steve > --- > > Changes since v2: > - really remove mcount() declaration too. I made a mistake when sending out v2 > > Changes since v1: > - remove mcount() declaration too > > arch/arm/include/asm/ftrace.h | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/arch/arm/include/asm/ftrace.h b/arch/arm/include/asm/ftrace.h > index 18b0197f2384..48ec1d0337da 100644 > --- a/arch/arm/include/asm/ftrace.h > +++ b/arch/arm/include/asm/ftrace.h > @@ -11,7 +11,6 @@ > #define MCOUNT_INSN_SIZE 4 /* sizeof mcount call */ > > #ifndef __ASSEMBLY__ > -extern void mcount(void); > extern void __gnu_mcount_nc(void); > > #ifdef CONFIG_DYNAMIC_FTRACE > @@ -23,9 +22,6 @@ static inline unsigned long ftrace_call_adjust(unsigned long addr) > /* With Thumb-2, the recorded addresses have the lsb set */ > return addr & ~1; > } > - > -extern void ftrace_caller_old(void); > -extern void ftrace_call_old(void); > #endif > > #endif
diff --git a/arch/arm/include/asm/ftrace.h b/arch/arm/include/asm/ftrace.h index 18b0197f2384..48ec1d0337da 100644 --- a/arch/arm/include/asm/ftrace.h +++ b/arch/arm/include/asm/ftrace.h @@ -11,7 +11,6 @@ #define MCOUNT_INSN_SIZE 4 /* sizeof mcount call */ #ifndef __ASSEMBLY__ -extern void mcount(void); extern void __gnu_mcount_nc(void); #ifdef CONFIG_DYNAMIC_FTRACE @@ -23,9 +22,6 @@ static inline unsigned long ftrace_call_adjust(unsigned long addr) /* With Thumb-2, the recorded addresses have the lsb set */ return addr & ~1; } - -extern void ftrace_caller_old(void); -extern void ftrace_call_old(void); #endif #endif
Commit d3c61619568c ("ARM: 8788/1: ftrace: remove old mcount support") removed the old mcount support, but forget to remove these three declarations. This patch removes them. Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com> --- Changes since v2: - really remove mcount() declaration too. I made a mistake when sending out v2 Changes since v1: - remove mcount() declaration too arch/arm/include/asm/ftrace.h | 4 ---- 1 file changed, 4 deletions(-)