2020-10-27 00:22:42

by Sasha Levin

Subject: [PATCH AUTOSEL 4.19 08/60] MIPS: ftrace: Remove redundant #ifdef CONFIG_DYNAMIC_FTRACE

From: Zejiang Tang <[email protected]>

[ Upstream commit 39116103a7345927fa99644d08bc0cc9d45fea6f ]

There exists redundant #ifdef CONFIG_DYNAMIC_FTRACE in ftrace.c, remove it.

Signed-off-by: Zejiang Tang <[email protected]>
Reviewed-by: Steven Rostedt (VMware) <[email protected]>
Signed-off-by: Thomas Bogendoerfer <[email protected]>
Signed-off-by: Sasha Levin <[email protected]>
---
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)
--
2.25.1

2020-10-28 05:11:55

by Sergei Shtylyov

Subject: Re: [PATCH AUTOSEL 4.19 08/60] MIPS: ftrace: Remove redundant #ifdef CONFIG_DYNAMIC_FTRACE

Hello!

On 27.10.2020 3:03, Sasha Levin wrote:

> From: Zejiang Tang <[email protected]>
>
> [ Upstream commit 39116103a7345927fa99644d08bc0cc9d45fea6f ]
>
> There exists redundant #ifdef CONFIG_DYNAMIC_FTRACE in ftrace.c, remove it.
>
> Signed-off-by: Zejiang Tang <[email protected]>
> Reviewed-by: Steven Rostedt (VMware) <[email protected]>
> Signed-off-by: Thomas Bogendoerfer <[email protected]>
> Signed-off-by: Sasha Levin <[email protected]>
> ---
> 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