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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A581AECAAA1 for ; Thu, 27 Oct 2022 17:03:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236894AbiJ0RDy (ORCPT ); Thu, 27 Oct 2022 13:03:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58044 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236897AbiJ0RDv (ORCPT ); Thu, 27 Oct 2022 13:03:51 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 44ECB196EE9 for ; Thu, 27 Oct 2022 10:03:50 -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 ams.source.kernel.org (Postfix) with ESMTPS id E9F70B825F3 for ; Thu, 27 Oct 2022 17:03:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4ED92C433C1; Thu, 27 Oct 2022 17:03:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666890227; bh=ZRyONuv5fTlo/e1ONS+EjWyOBAWm4CGueazIRljzvGc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hY3XKuwTIDtETavyxzWbU/qEEDqfxNnikSvWyP8zLB+sOVRIfM7RQlTdVuxxDxR0c PjuNIt78UdVP9lkIwFmH41oFXWQqqm9TerMSPcoKRTSLhBtDk5f9/t8s6g41NIiGvy JDyeYGbwkBNi6EV6CVwwZV2sbPhH6lRva90UxaFo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, sunliming , "Steven Rostedt (Google)" , Sasha Levin Subject: [PATCH 5.15 71/79] tracing: Simplify conditional compilation code in tracing_set_tracer() Date: Thu, 27 Oct 2022 18:56:09 +0200 Message-Id: <20221027165057.278920220@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221027165054.917467648@linuxfoundation.org> References: <20221027165054.917467648@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: sunliming [ Upstream commit f4b0d318097e45cbac5e14976f8bb56aa2cef504 ] Two conditional compilation directives "#ifdef CONFIG_TRACER_MAX_TRACE" are used consecutively, and no other code in between. Simplify conditional the compilation code and only use one "#ifdef CONFIG_TRACER_MAX_TRACE". Link: https://lkml.kernel.org/r/20220602140613.545069-1-sunliming@kylinos.cn Signed-off-by: sunliming Signed-off-by: Steven Rostedt (Google) Stable-dep-of: a541a9559bb0 ("tracing: Do not free snapshot if tracer is on cmdline") Signed-off-by: Sasha Levin --- kernel/trace/trace.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 0dc17fd96102..21795777587b 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -6416,9 +6416,7 @@ int tracing_set_tracer(struct trace_array *tr, const char *buf) synchronize_rcu(); free_snapshot(tr); } -#endif -#ifdef CONFIG_TRACER_MAX_TRACE if (t->use_max_tr && !had_max_tr) { ret = tracing_alloc_snapshot_instance(tr); if (ret < 0) -- 2.35.1