From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9B337C433EF for ; Thu, 24 Feb 2022 01:18:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=BdadkQ4cDot7RzN/nTTzPhGAZaWxj/2q4b9PmdqmDkc=; b=payTQBL+UFRJEZ 05wrdcldtnZksMznahFjyTOhs4R3wPQ5tvwbZcQOjFpC94m9/1b4VpZzoWk2+cTtoDpw7jggHZS5a WFP10MJkDAvd/YEC2TEttE9espPctf+UJWW/CjHnclaV7eZyyutyQRFfWCC07CUOsBCOCqAWNAoyT tyRX8pjoRYJvxqVRXTR7ApOPZNGMlrKj+1Var/RJf7J5JXlHfBQva8YPS+2JDQL2DvckJtIch7CMb iZgXY2PDbM/wlCUsiq6tBV06RkQ35eqn/i8CjxBRhF41KhdXT6owGPEe6m9TOnW12t1durEBcWU8j FAIB8sl7q38vZ6TTsuHw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nN2lN-00GQwh-MM; Thu, 24 Feb 2022 01:17:45 +0000 Received: from sin.source.kernel.org ([145.40.73.55]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nN2lK-00GQv3-5s for linux-arm-kernel@lists.infradead.org; Thu, 24 Feb 2022 01:17:43 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id 5C3C0CE1C37; Thu, 24 Feb 2022 01:17:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9373CC340EF; Thu, 24 Feb 2022 01:17:27 +0000 (UTC) Date: Wed, 23 Feb 2022 20:17:25 -0500 From: Steven Rostedt To: Chengming Zhou Cc: mingo@redhat.com, catalin.marinas@arm.com, will@kernel.org, broonie@kernel.org, mark.rutland@arm.com, tglx@linutronix.de, bp@alien8.de, dave.hansen@linux.intel.com, linux-arm-kernel@lists.infradead.org, x86@kernel.org, linux-kernel@vger.kernel.org, songmuchun@bytedance.com, qirui.001@bytedance.com Subject: Re: [PATCH v2 1/2] ftrace: cleanup ftrace_graph_caller enable and disable Message-ID: <20220223201725.4cbb6d8a@rorschach.local.home> In-Reply-To: <20220223090132.10114-1-zhouchengming@bytedance.com> References: <20220223090132.10114-1-zhouchengming@bytedance.com> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220223_171742_423907_419F6B04 X-CRM114-Status: GOOD ( 15.59 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Wed, 23 Feb 2022 17:01:31 +0800 Chengming Zhou wrote: > diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c > index 7cc540e6de0c..c119ef7a9295 100644 > --- a/arch/x86/kernel/ftrace.c > +++ b/arch/x86/kernel/ftrace.c > @@ -615,18 +615,8 @@ int ftrace_disable_ftrace_graph_caller(void) > > return ftrace_mod_jmp(ip, &ftrace_stub); > } > -#else /* !CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS */ > -int ftrace_enable_ftrace_graph_caller(void) > -{ > - return 0; > -} > - > -int ftrace_disable_ftrace_graph_caller(void) > -{ > - return 0; > -} > -#endif /* CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS */ > -#endif /* !CONFIG_DYNAMIC_FTRACE */ > +#endif /* !CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS */ > +#endif /* CONFIG_DYNAMIC_FTRACE */ Since you are cleaning this up, and the above starts with: #ifdef CONFIG_DYNAMIC_FTRACE #ifndef CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS They were separate because of the #else that you just removed. I would recommend consolidate them into a single #ifdef: #if defined(CONFIG_DYNAMIC_FTRACE) && !defined(CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS) [..] #endif /* CONFIG_DYNAMIC_FTRACE && !CONFIG_HAVE_DYNAMI_FTRACE_WITH_ARGS */ -- Steve > > /* > * Hook the return address and push it in the stack of return addrs > diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c > index f9feb197b2da..60ae009e6684 100644 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel