Received: by 2002:a05:6a10:413:0:0:0:0 with SMTP id 19csp3872443pxp; Tue, 15 Mar 2022 07:57:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxwCbLRUbXQ7o1kSEEvxxu4p7lZ9iy2E7nR/muSvQaMv+MhLhHhT/LWqALACBM4vzIiLvi1 X-Received: by 2002:a17:902:ec8d:b0:151:cab8:9aa9 with SMTP id x13-20020a170902ec8d00b00151cab89aa9mr27738837plg.173.1647356275798; Tue, 15 Mar 2022 07:57:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647356275; cv=none; d=google.com; s=arc-20160816; b=qgc4saR+sH93T1+CAwMewFl9Mg54dZd50ZwUg5xhYxqLPKaK9Iqu/D0eb12QNBDgN7 KGydE0VEA9yGOfiIN6Yg9sckqQD8fCdaTftbLqYFuyJjZrstfg/Yv7xFY6mjjzW6ck5O KD0LjbSf9Yo1QUbZYtQB00weUB6JYA8cgbEOaez8mF+5x0TYh+3kYyTWty8bYvfwpcB8 CwPOBpOc4kQx6cM5/5/tRgl+85Oh6TswF9JCJy0YHNiA5IpJRk+gmb9r4rnlBBWhCYwv tkSKsTJxnUjWQ7pGVfcuQ2mi4V2lP5oHMCsL726oauWpUFLumvlc0urPkiaDj6zUO+wA DWYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=nUlHjR924e9McKN6ClkZV+w3xjcrAZApNEKQ1k2KoME=; b=S4OYLAsphUYzCqw3TDcDNKalwYomi6LfP0oebx2zpBqyrsDC/MlyHbcPlu7FVy2W44 Q6AEfXGEpckGTS/wOIIsIpu2tg5zmpQC9Tdl1AFMYVbPfPM1lnyhtW1wqv2OvGK40lo2 A5ORn12JTWQhEkZTTFmRBlxnHoRsGIumTqD9zT8PCsHpN09EmmcvX0FUshlatj8PWyAP C4IKeP9x5J6xZkH9OdcXGIWD9RaEYCNS8NUA8N4qSvvOzf/532vzYyJtcDX69cW4yEmh ZliynM6P21lPdB8sEp/NT2mH/lalWfGSORnu1CGGmpPTaUhC6gO1yjM/am0S8gUWiRJp 2NZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=NFrqH8dm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k11-20020a056a00134b00b004f79525587fsi11598927pfu.343.2022.03.15.07.57.42; Tue, 15 Mar 2022 07:57:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=NFrqH8dm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244296AbiCNMbx (ORCPT + 99 others); Mon, 14 Mar 2022 08:31:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48906 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243657AbiCNMVH (ORCPT ); Mon, 14 Mar 2022 08:21:07 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B8CFB55202; Mon, 14 Mar 2022 05:16:36 -0700 (PDT) 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 dfw.source.kernel.org (Postfix) with ESMTPS id 5288060C71; Mon, 14 Mar 2022 12:16:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5C9A1C340E9; Mon, 14 Mar 2022 12:16:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1647260195; bh=cwguBtztnNbV8hxATJW/2SnShoO0jpbrx3D/7sf+30I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NFrqH8dmHQws33v+rYyDsNlweqxMoq81rhtuVgA2I1KxKkGaPGisGXLMjW9g0PLIT SEJLo01gGq2Du0TV6jHeWqWy9oLVS4/nm+uje8a3EAl/EVJoFf1cATZQZgMwetF3xA OZkjcIoqbWltbRYrsPnMo9q29w2qiTTwycguOW6Y= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Christophe Leroy , "Steven Rostedt (Google)" , Sasha Levin Subject: [PATCH 5.16 083/121] tracing: Fix selftest config check for function graph start up test Date: Mon, 14 Mar 2022 12:54:26 +0100 Message-Id: <20220314112746.436979608@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220314112744.120491875@linuxfoundation.org> References: <20220314112744.120491875@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Christophe Leroy [ Upstream commit c5229a0bd47814770c895e94fbc97ad21819abfe ] CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS is required to test direct tramp. Link: https://lkml.kernel.org/r/bdc7e594e13b0891c1d61bc8d56c94b1890eaed7.1640017960.git.christophe.leroy@csgroup.eu Signed-off-by: Christophe Leroy Signed-off-by: Steven Rostedt (Google) Signed-off-by: Sasha Levin --- kernel/trace/trace_selftest.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/kernel/trace/trace_selftest.c b/kernel/trace/trace_selftest.c index afd937a46496..abcadbe933bb 100644 --- a/kernel/trace/trace_selftest.c +++ b/kernel/trace/trace_selftest.c @@ -784,9 +784,7 @@ static struct fgraph_ops fgraph_ops __initdata = { .retfunc = &trace_graph_return, }; -#if defined(CONFIG_DYNAMIC_FTRACE) && \ - defined(CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS) -#define TEST_DIRECT_TRAMP +#ifdef CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS noinline __noclone static void trace_direct_tramp(void) { } #endif @@ -849,7 +847,7 @@ trace_selftest_startup_function_graph(struct tracer *trace, goto out; } -#ifdef TEST_DIRECT_TRAMP +#ifdef CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS tracing_reset_online_cpus(&tr->array_buffer); set_graph_array(tr); -- 2.34.1