[PATCH] arm/ftrace: Remove duplicate function

[PATCH] arm/ftrace: Remove duplicate function

[guoren]

From: Guo Ren <guoren@linux.alibaba.com>

There is no arch implementation of ftrace_arch_code_modify_prepare in arm,
so just use the __weak one in kernel/trace/ftrace.c.

Signed-off-by: Guo Ren <guoren@linux.alibaba.com>
---
 arch/arm/kernel/ftrace.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/arch/arm/kernel/ftrace.c b/arch/arm/kernel/ftrace.c
index 10499d44964a..f66ade28eb8a 100644
--- a/arch/arm/kernel/ftrace.c
+++ b/arch/arm/kernel/ftrace.c
@@ -56,11 +56,6 @@ static unsigned long adjust_address(struct dyn_ftrace *rec, unsigned long addr)
 	return addr;
 }
 
-int ftrace_arch_code_modify_prepare(void)
-{
-	return 0;
-}
-
 int ftrace_arch_code_modify_post_process(void)
 {
 	/* Make sure any TLB misses during machine stop are cleared. */
-- 
2.17.0

Re: [PATCH] arm/ftrace: Remove duplicate function

[Steven Rostedt]

On Fri, 20 Mar 2020 14:53:40 +0800
guoren@kernel.org wrote:

> From: Guo Ren <guoren@linux.alibaba.com>
> 
> There is no arch implementation of ftrace_arch_code_modify_prepare in arm,
> so just use the __weak one in kernel/trace/ftrace.c.

Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

-- Steve

> 
> Signed-off-by: Guo Ren <guoren@linux.alibaba.com>
> ---
>  arch/arm/kernel/ftrace.c | 5 -----
>  1 file changed, 5 deletions(-)
> 
> diff --git a/arch/arm/kernel/ftrace.c b/arch/arm/kernel/ftrace.c
> index 10499d44964a..f66ade28eb8a 100644
> --- a/arch/arm/kernel/ftrace.c
> +++ b/arch/arm/kernel/ftrace.c
> @@ -56,11 +56,6 @@ static unsigned long adjust_address(struct dyn_ftrace *rec, unsigned long addr)
>  	return addr;
>  }
>  
> -int ftrace_arch_code_modify_prepare(void)
> -{
> -	return 0;
> -}
> -
>  int ftrace_arch_code_modify_post_process(void)
>  {
>  	/* Make sure any TLB misses during machine stop are cleared. */