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=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,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 933F1C433DF for ; Mon, 8 Jun 2020 10:03:04 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 67C0C206A4 for ; Mon, 8 Jun 2020 10:03:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Ff6DPt2E" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 67C0C206A4 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject: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=I5+9ciWxIx4+BBxC/9622RWbSDPEEo0mqIvOKeph1H8=; b=Ff6DPt2EFgHPL5 rJ+4z2gzmQpgTX59b1BQGmQFbymrdzsE2/SaSYJBZoJ/Y3L/DEqTfI4P1LA17YCs95S+iNyL/Yh3k 4pJzMHq2p3YdgKTVAO4GCID6eNM+nohkwUEpoKBCOSDxa5QytyVZeM9CsRPO9CY/Rqdgw4e0ZL8VQ VzTSb/67a3ggvpn7OrUn5BXRlPX6TuhlpHktfeK3iLxm1cZdM5oNTYWyrrbSLPIOXILwqw3Tnpfdb O7xMlLRr4E0XUmgPwjSSHdvEH4V1Wv98LdzeTDwVo4kNx3pHsEkRLbaVo6soCUbz/LZZSOV93aYj3 rYXuvJnetZUpQmbcLM6w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jiEcR-0007k7-Cb; Mon, 08 Jun 2020 10:03:03 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jiEcO-0007jD-MV for linux-arm-kernel@lists.infradead.org; Mon, 08 Jun 2020 10:03:02 +0000 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 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-Disposition: inline In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200608_030300_775452_FCDDCE8E X-CRM114-Status: GOOD ( 18.96 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Catalin Marinas , linux-kernel , Steven Rostedt , Andrew Morton , Will Deacon , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.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. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel