From patchwork Thu Oct 20 21:04:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 6406 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4242:0:0:0:0:0 with SMTP id s2csp323705wrr; Thu, 20 Oct 2022 14:07:18 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7FdV/nvMuwJ+Rl65GWH8EdOaQzKAKq3TLqFUayX78/+G1jAPVYtUqU41ht7wiECHr9D/VX X-Received: by 2002:a17:907:7611:b0:78d:9d69:adf9 with SMTP id jx17-20020a170907761100b0078d9d69adf9mr12745822ejc.283.1666300038514; Thu, 20 Oct 2022 14:07:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666300038; cv=none; d=google.com; s=arc-20160816; b=l+7TZXxW7BKAn6tY5BHDfk0drskZP8gxiuW18EZ4y+CH4gM3vEk6iUgUXhgUUPSsOh zQ8foAsCNOKUn9gbp6ty+OmOnw1QEUfPI7T2te1yAPYKBwwxVdtf780KEeO/qO/ry22k bVVy4+15BDAgzvejak4bGjsLAWEKz5h0Ms/h0XWP+SxTB3NVW8YQDF11GVtnzEPOOUhb cnUmXxJflAmz3T4C6kmW3ubZl6M54zqQk72kS/lQZh0uMoB/tV9eDFOLfFDxcj4z5CR8 v62NsC8zJZkFHygY7r1PF6JyKmT0EsMPznxg8kQvrSWC1vVsJh0A3KSHT/fGO5e3hJuS nT8w== 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 :message-id:subject:cc:to:from:date; bh=0KVCsTMjTyBu5QhJbFnoOyPyAtkGibhhtSzjnUqcMQ8=; b=EAy36ANjVBCh/Kkz/sXjt2izckADD3kFaNqaFx1e11mXdS5zSdj5+SGE0AGruCCMW3 4PpB7SUVsxwfZCBInmbcb96pllIiP0h9AE9tUo91Rp2ndEsfujCiX4Co1MvPXuPBTJxH HAmjJchjoZnevqGPrDmj3mmrIS5yeKd+kApkvkXUvPpqGUxKA/yINlRnPoCG9kOsIr8l +41j0W9x1JZQPubeCD2MniBMNKn+A4NG85Dnzx14L0ANegHi9l51dUHAWRLwHYMNL+e6 gVrUTvP9Cv546CT9kMS4P5RiJ0PNjjw6M92yxt8BDQ8M50AcXc59gE5mLyqC7SEUPEqD zevw== 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 cu9-20020a170906e00900b007830f14fffesi16387676ejb.375.2022.10.20.14.06.54; Thu, 20 Oct 2022 14:07:18 -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; 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 S230005AbiJTVFA (ORCPT + 99 others); Thu, 20 Oct 2022 17:05:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50912 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230009AbiJTVEw (ORCPT ); Thu, 20 Oct 2022 17:04:52 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D4794402F5 for ; Thu, 20 Oct 2022 14:04:41 -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 D286661D1C for ; Thu, 20 Oct 2022 21:04:40 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id ADE37C433C1; Thu, 20 Oct 2022 21:04:39 +0000 (UTC) Date: Thu, 20 Oct 2022 17:04:44 -0400 From: Steven Rostedt To: Linus Torvalds Cc: LKML , Masami Hiramatsu , Daniel Bristot de Oliveira Subject: [GIT PULL] rv/dot2c: Make automaton definition static Message-ID: <20221020170444.2177b0b3@gandalf.local.home> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED 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?1747066546701831966?= X-GMAIL-MSGID: =?utf-8?q?1747242229082433046?= Linus, This fix fell through the cracks. Note, we are working on making "topic" branches for tracing. So we will be having different pull requests for each topic. Tracing/tools updates for 6.1-rc1: - Make dot2c generate monitor's automata definition static Please pull the latest trace-tools-6.1-rc1 tree, which can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git trace-tools-6.1-rc1 Tag SHA1: 1ee5bf9e2eff62eb25ac0e904c1a48f7c55d26ff Head SHA1: 21a1994b6492b12e55dbf39d15271430ef6839f0 Daniel Bristot de Oliveira (1): rv/dot2c: Make automaton definition static ---- tools/verification/dot2/dot2c.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --------------------------- commit 21a1994b6492b12e55dbf39d15271430ef6839f0 Author: Daniel Bristot de Oliveira Date: Tue Aug 23 17:20:28 2022 +0200 rv/dot2c: Make automaton definition static Monitor's automata definition is only used locally, so make dot2c generate a static definition. Link: https://lore.kernel.org/all/202208210332.gtHXje45-lkp@intel.com Link: https://lore.kernel.org/all/202208210358.6HH3OrVs-lkp@intel.com Link: https://lkml.kernel.org/r/ffbb92010f643307766c9307fd42f416e5b85fa0.1661266564.git.bristot@kernel.org Cc: Steven Rostedt Fixes: e3c9fc78f096 ("tools/rv: Add dot2c") Reported-by: kernel test robot Signed-off-by: Daniel Bristot de Oliveira Signed-off-by: Steven Rostedt (Google) diff --git a/tools/verification/dot2/dot2c.py b/tools/verification/dot2/dot2c.py index fa73353f7e56..be8a364a469b 100644 --- a/tools/verification/dot2/dot2c.py +++ b/tools/verification/dot2/dot2c.py @@ -111,7 +111,7 @@ class Dot2c(Automata): def format_aut_init_header(self): buff = [] - buff.append("struct %s %s = {" % (self.struct_automaton_def, self.var_automaton_def)) + buff.append("static struct %s %s = {" % (self.struct_automaton_def, self.var_automaton_def)) return buff def __get_string_vector_per_line_content(self, buff):