From patchwork Sat Dec 10 13:58:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 32037 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp1339446wrr; Sat, 10 Dec 2022 06:29:33 -0800 (PST) X-Google-Smtp-Source: AA0mqf6zQDKCmrnu0tEpb+kWB4dm5lYLj6HW4tvJLr7FH7RLT24T5TBXSb1qo1gHsEmh3brHGPhB X-Received: by 2002:a17:906:3c15:b0:7c1:4d21:abb7 with SMTP id h21-20020a1709063c1500b007c14d21abb7mr2452541ejg.54.1670680844467; Sat, 10 Dec 2022 06:00:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670680844; cv=none; d=google.com; s=arc-20160816; b=JjgK69qk+RzUnWlEn3pMOOgSgFzPxWYjKDvFJck0ond1aVCoXNeAdH7Cx5/4i7Ifsq cGH2HZWaeryQ1elNNQTxzUzCg43SsAGL9w9vTqsyVx6CQw8/QByiEE7Kl3wjFcGGtp91 i6sG9c1DVNdblVz9uIpGZ8pAsNqBdEY9Q7QbdJlNSk5PIMXWQIlzKNUXry6Gj/VMkeTx e4JZXZ2LnuJhGRbe0e0t7NlYwdCmKnApVKu0xKi3+xiwoS9toSpyGVk3nKwW9sfkMDoM eYwSQ1sTGkK9yojpG1tZ9JBC+B4hQLM9VELKNKyM0IRBH0xZctToRo27R742V7gLnuE7 BtlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:subject:cc:to:from:date :user-agent:message-id; bh=2eyCAWUEiXx/vOpOkPC9W9Qqv0avcTev8l7IFeT81VM=; b=dbmYIw+4g1vtc4KncCYYrcMpbTnkwQMJkzUQIltqCe2lMHQffnGW7rbsGnZ5iUECrV /RNsO7w+JadqtVSLftEejhgbvZ+hUvg9W/Jk9XO6yY24xQJtDsbCskdG1RbmWooeRc88 mrXFqEfg/9nod1jBAXQ8v59UwI9WlKNoREt8+XKD+QVM4z3fXd2UQ9APoA2fMEGXpVGZ 7zmCxHLFcEbnxpz9gXZQeoLPxkIBxN4WE77GLuX7shkPcGOHYI1DW8Ii7TGyyJaSYT8m vyhEdoXSxCZQMGtbFCkqo13u1WDLZH8gyloZ46Gmvn093Wj3q+fh056G1poijsMV2PTw 2Q7g== ARC-Authentication-Results: i=1; mx.google.com; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id sd7-20020a1709076e0700b007c0fb283f11si2470364ejc.130.2022.12.10.06.00.20; Sat, 10 Dec 2022 06:00:44 -0800 (PST) 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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230107AbiLJN7h (ORCPT + 99 others); Sat, 10 Dec 2022 08:59:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34954 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229704AbiLJN63 (ORCPT ); Sat, 10 Dec 2022 08:58:29 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C4833186EA for ; Sat, 10 Dec 2022 05:58:27 -0800 (PST) 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 5684B60C2C for ; Sat, 10 Dec 2022 13:58:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 31DA0C433AE; Sat, 10 Dec 2022 13:58:27 +0000 (UTC) Received: from rostedt by gandalf.local.home with local (Exim 4.96) (envelope-from ) id 1p40N0-000ktr-0x; Sat, 10 Dec 2022 08:58:26 -0500 Message-ID: <20221210135826.163090876@goodmis.org> User-Agent: quilt/0.66 Date: Sat, 10 Dec 2022 08:58:09 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Andrew Morton , Mathieu Desnoyers , Joel Fernandes , Tom Zanussi , Ross Zwisler Subject: [for-next][PATCH 19/25] tracing: remove unnecessary trace_trigger ifdef References: <20221210135750.425719934@goodmis.org> MIME-Version: 1.0 X-Spam-Status: No, score=-6.7 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,SPF_HELO_NONE,SPF_PASS 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1751835837214880142?= X-GMAIL-MSGID: =?utf-8?q?1751835837214880142?= From: Ross Zwisler The trace_trigger command line option introduced by commit a01fdc897fa5 ("tracing: Add trace_trigger kernel command line option") doesn't need to depend on the CONFIG_HIST_TRIGGERS kernel config option. This code doesn't depend on the histogram code, and the run-time selection of triggers is usable without CONFIG_HIST_TRIGGERS. Link: https://lore.kernel.org/linux-trace-kernel/20221209003310.1737039-1-zwisler@google.com Cc: Masami Hiramatsu Cc: Andrew Morton Cc: Mathieu Desnoyers Cc: Joel Fernandes Cc: Tom Zanussi Fixes: a01fdc897fa5 ("tracing: Add trace_trigger kernel command line option") Signed-off-by: Ross Zwisler Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace_events.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c index 3bfaf560ecc4..33e0b4f8ebe6 100644 --- a/kernel/trace/trace_events.c +++ b/kernel/trace/trace_events.c @@ -2796,7 +2796,6 @@ trace_create_new_event(struct trace_event_call *call, return file; } -#ifdef CONFIG_HIST_TRIGGERS #define MAX_BOOT_TRIGGERS 32 static struct boot_triggers { @@ -2832,7 +2831,6 @@ static __init int setup_trace_triggers(char *str) return 1; } __setup("trace_trigger=", setup_trace_triggers); -#endif /* Add an event to a trace directory */ static int @@ -2850,7 +2848,6 @@ __trace_add_new_event(struct trace_event_call *call, struct trace_array *tr) return event_define_fields(call); } -#ifdef CONFIG_HIST_TRIGGERS static void trace_early_triggers(struct trace_event_file *file, const char *name) { int ret; @@ -2868,9 +2865,6 @@ static void trace_early_triggers(struct trace_event_file *file, const char *name bootup_triggers[i].event); } } -#else -static inline void trace_early_triggers(struct trace_event_file *file, const char *name) { } -#endif /* * Just create a descriptor for early init. A descriptor is required