Skip to contentSkip to conversation

ARM: ftrace: remove mcount(),ftrace_caller_old() and ftrace_call_old()

PATCH Superseded Jisheng Zhang 1 participant 2 messages Aug 23, 2019 – Aug 29, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 ARM: ftrace: remove mcount(),ftrace_caller_old() and ftrace_call_old()

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.

---

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(-)
arch/arm/include/asm/ftrace.h +0 -4
index 18b0197f2384..48ec1d0337da 100644
@@ -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
Signature · 1 line
2.23.0.rc1
#1 lore raw

Hi Russell,

Quoted 3 lines · On Fri, 23 Aug 2019 18:22:39 +0800 Jisheng Zhang 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.

May I put this patch into your patch system?

thanks

Quoted 35 lines

---

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(-)
arch/arm/include/asm/ftrace.h +0 -4
index 18b0197f2384..48ec1d0337da 100644
@@ -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