From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 5 Oct 2025 16:38:26 +0000 (-0700)
Subject: Merge tag 'trace-tools-v6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/trace... 
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d9f24f8e60798c066ead61f77e67ee6a5a204514;p=thirdparty%2Fkernel%2Fstable.git

Merge tag 'trace-tools-v6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace

Pull tracing tools updates from Steven Rostedt

 - This is mostly just consolidating code between osnoise/timerlat and
   top/hist for easier maintenance and less future divergence

* tag 'trace-tools-v6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
  tools/rtla: Add remaining support for osnoise actions
  tools/rtla: Add test engine support for unexpected output
  tools/rtla: Fix -A option name in test comment
  tools/rtla: Consolidate code between osnoise/timerlat and hist/top
  tools/rtla: Create common_apply_config()
  tools/rtla: Move top/hist params into common struct
  tools/rtla: Consolidate common parameters into shared structure
---

d9f24f8e60798c066ead61f77e67ee6a5a204514
diff --cc tools/tracing/rtla/src/actions.c
index 13ff1934d47c9,991139f9069f1..8945aee58d511
--- a/tools/tracing/rtla/src/actions.c
+++ b/tools/tracing/rtla/src/actions.c
@@@ -127,11 -127,11 +127,11 @@@ actions_add_continue(struct actions *se
   * actions_parse - add an action based on text specification
   */
  int
- actions_parse(struct actions *self, const char *trigger)
+ actions_parse(struct actions *self, const char *trigger, const char *tracefn)
  {
  	enum action_type type = ACTION_NONE;
- 	char *token;
+ 	const char *token;
 -	char trigger_c[strlen(trigger)];
 +	char trigger_c[strlen(trigger) + 1];
  
  	/* For ACTION_SIGNAL */
  	int signal = 0, pid = 0;