Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Subject: Re: [PATCH AUTOSEL 4.19 08/60] MIPS: ftrace: Remove redundant #ifdef
 CONFIG_DYNAMIC_FTRACE
To:     Sasha Levin <sashal@kernel.org>, linux-kernel@vger.kernel.org,
        stable@vger.kernel.org
Cc:     Zejiang Tang <tangzejiang@loongson.cn>,
        Steven Rostedt <rostedt@goodmis.org>,
        Thomas Bogendoerfer <tsbogend@alpha.franken.de>,
        linux-mips@vger.kernel.org
References: <20201027000415.1026364-1-sashal@kernel.org>
 <20201027000415.1026364-8-sashal@kernel.org>
From:   Sergei Shtylyov <sergei.shtylyov@gmail.com>
Organization: Brain-dead Software
Message-ID: <ac792f50-7bb9-1234-c38a-1d2e32aaf56c@gmail.com>
Date:   Tue, 27 Oct 2020 10:59:43 +0300
User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:68.0) Gecko/20100101
 Thunderbird/68.12.1
MIME-Version: 1.0
In-Reply-To: <20201027000415.1026364-8-sashal@kernel.org>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Precedence: bulk

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