From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1AF80AD23 for ; Thu, 27 Oct 2022 17:07:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 98330C433C1; Thu, 27 Oct 2022 17:07:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666890464; bh=EV1gBDJx/SfFybx7k+PKSktofkEVrXBTiVUpaG/OleA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nywNZMcjqo7TDWDX8MDPv7YebwkFX2mLl31i5t96b1AFM+M0S+WdpQOSHSoAXCy1n dM7IzkRR1XOfMmvLHV9ib8Jwj9zpXxawXAvqXJqcamd4MSIqLsAPzywwe6JLaIv8+W g6K28j/BYJSMAyHXNHtSnhqnxlipe32PPLlC8ZPU= 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.10 58/79] tracing: Simplify conditional compilation code in tracing_set_tracer() Date: Thu, 27 Oct 2022 18:56:08 +0200 Message-Id: <20221027165056.266103266@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221027165054.270676357@linuxfoundation.org> References: <20221027165054.270676357@linuxfoundation.org> User-Agent: quilt/0.67 Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 a5245362ce7a..870033f9c198 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -6025,9 +6025,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