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 X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 093D9C433DF for ; Mon, 8 Jun 2020 10:03:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D9C2C206A4 for ; Mon, 8 Jun 2020 10:02:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729347AbgFHKC7 (ORCPT ); Mon, 8 Jun 2020 06:02:59 -0400 Received: from foss.arm.com ([217.140.110.172]:50648 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728745AbgFHKC6 (ORCPT ); Mon, 8 Jun 2020 06:02:58 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 5DEA91FB; Mon, 8 Jun 2020 03:02:58 -0700 (PDT) Received: from C02TD0UTHF1T.local (unknown [10.57.6.198]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 1137B3F73D; Mon, 8 Jun 2020 03:02:56 -0700 (PDT) Date: Mon, 8 Jun 2020 11:02:44 +0100 From: Mark Rutland To: Joe Perches Cc: Steven Rostedt , Catalin Marinas , Will Deacon , Andrew Morton , linux-arm-kernel@lists.infradead.org, linux-kernel Subject: Re: [Possible PATCH]arm64: ftrace: Change CONFIG_FTRACE_WITH_REGS to CONFIG_DYNAMIC_FTRACE_WITH_REGS Message-ID: <20200608100233.GA8866@C02TD0UTHF1T.local> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, Jun 06, 2020 at 12:25:50PM -0700, Joe Perches wrote: > CONFIG_FTRACE_WITH_REGS does not exist as a Kconfig symbol. > > Signed-off-by: Joe Perches > --- > > I don't have the hardware, so I can't tell if this is a > correct change, but it is a logical one. > > Found by a test script that looks for IS_ENABLED(FOO) > where FOO must also exist in Kconfig files. > > arch/arm64/kernel/ftrace.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/arch/arm64/kernel/ftrace.c b/arch/arm64/kernel/ftrace.c > index 8618faa82e6d..86a5cf9bc19a 100644 > --- a/arch/arm64/kernel/ftrace.c > +++ b/arch/arm64/kernel/ftrace.c > @@ -69,7 +69,8 @@ static struct plt_entry *get_ftrace_plt(struct module *mod, unsigned long addr) > > if (addr == FTRACE_ADDR) > return &plt[FTRACE_PLT_IDX]; > - if (addr == FTRACE_REGS_ADDR && IS_ENABLED(CONFIG_FTRACE_WITH_REGS)) > + if (addr == FTRACE_REGS_ADDR && > + IS_ENABLED(CONFIG_DYNAMIC_FTRACE_WITH_REGS)) > return &plt[FTRACE_REGS_PLT_IDX]; This was my bad; I broke this among some cleanup, and evidently I did not test that as well as I thought I had. This should be backported, so we should add: Fixes: 3b23e4991fb66f6d ("arm64: implement ftrace with regs") Looks good to me, so: Acked-by: Mark Rutland Thanks, Mark.