lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH AUTOSEL 4.19 08/60] MIPS: ftrace: Remove redundant #ifdef CONFIG_DYNAMIC_FTRACE
From
Date
Hello!

On 27.10.2020 3:03, Sasha Levin wrote:

> From: Zejiang Tang <tangzejiang@loongson.cn>
>
> [ Upstream commit 39116103a7345927fa99644d08bc0cc9d45fea6f ]
>
> There exists redundant #ifdef CONFIG_DYNAMIC_FTRACE in ftrace.c, remove it.
>
> Signed-off-by: Zejiang Tang <tangzejiang@loongson.cn>
> Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
> Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
> Signed-off-by: Sasha Levin <sashal@kernel.org>
> ---
> arch/mips/kernel/ftrace.c | 4 ----
> 1 file changed, 4 deletions(-)
>
> diff --git a/arch/mips/kernel/ftrace.c b/arch/mips/kernel/ftrace.c
> index b122cbb4aad18..7dd52da55907f 100644
> --- a/arch/mips/kernel/ftrace.c
> +++ b/arch/mips/kernel/ftrace.c
> @@ -37,10 +37,6 @@ void arch_ftrace_update_code(int command)
> ftrace_modify_all_code(command);
> }
>
> -#endif
> -
> -#ifdef CONFIG_DYNAMIC_FTRACE
> -
> #define JAL 0x0c000000 /* jump & link: ip --> ra, jump to target */
> #define ADDR_MASK 0x03ffffff /* op_code|addr : 31...26|25 ....0 */
> #define JUMP_RANGE_MASK ((1UL << 28) - 1)

Are you sure this is neccessary in -stable? What bug does it fix?

MBR, Sergei

\
 
 \ /
  Last update: 2020-10-27 09:01    [W:0.147 / U:0.096 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site