* [PATCH AUTOSEL 4.19 08/60] MIPS: ftrace: Remove redundant #ifdef CONFIG_DYNAMIC_FTRACE
[not found] <20201027000415.1026364-1-sashal@kernel.org>
@ 2020-10-27 0:03 ` Sasha Levin
2020-10-27 7:59 ` Sergei Shtylyov
0 siblings, 1 reply; 2+ messages in thread
From: Sasha Levin @ 2020-10-27 0:03 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Zejiang Tang, Steven Rostedt, Thomas Bogendoerfer, Sasha Levin,
linux-mips
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)
--
2.25.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH AUTOSEL 4.19 08/60] MIPS: ftrace: Remove redundant #ifdef CONFIG_DYNAMIC_FTRACE
2020-10-27 0:03 ` [PATCH AUTOSEL 4.19 08/60] MIPS: ftrace: Remove redundant #ifdef CONFIG_DYNAMIC_FTRACE Sasha Levin
@ 2020-10-27 7:59 ` Sergei Shtylyov
0 siblings, 0 replies; 2+ messages in thread
From: Sergei Shtylyov @ 2020-10-27 7:59 UTC (permalink / raw)
To: Sasha Levin, linux-kernel, stable
Cc: Zejiang Tang, Steven Rostedt, Thomas Bogendoerfer, linux-mips
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-10-27 7:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20201027000415.1026364-1-sashal@kernel.org>
2020-10-27 0:03 ` [PATCH AUTOSEL 4.19 08/60] MIPS: ftrace: Remove redundant #ifdef CONFIG_DYNAMIC_FTRACE Sasha Levin
2020-10-27 7:59 ` Sergei Shtylyov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).