summaryrefslogtreecommitdiff
path: root/tools/perf/builtin-script.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-05-27 10:32:07 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-05-27 10:32:07 +0300
commit0e4daea31d8312dd9f957a62717d4b5f31ef494c (patch)
treea9edacaf51413354d0df35f6faf7f002a6f34bf0 /tools/perf/builtin-script.c
parentd5b3d02d0b107345f2a6ecb5b06f98356f5c97ab (diff)
parent44c026a73be8038f03dbdeef028b642880cf1511 (diff)
downloadlinux-0e4daea31d8312dd9f957a62717d4b5f31ef494c.tar.xz
Merge 6.4-rc3 into tty-next
We need the serial/tty fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/perf/builtin-script.c')
-rw-r--r--tools/perf/builtin-script.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index 006f522d0e7f..c57be48d65bb 100644
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -3647,6 +3647,13 @@ static int process_stat_config_event(struct perf_session *session __maybe_unused
union perf_event *event)
{
perf_event__read_stat_config(&stat_config, &event->stat_config);
+
+ /*
+ * Aggregation modes are not used since post-processing scripts are
+ * supposed to take care of such requirements
+ */
+ stat_config.aggr_mode = AGGR_NONE;
+
return 0;
}