summaryrefslogtreecommitdiff
path: root/tools/perf/builtin-record.c
diff options
context:
space:
mode:
authorNamhyung Kim <namhyung@kernel.org>2024-02-12 23:19:21 +0300
committerNamhyung Kim <namhyung@kernel.org>2024-02-12 23:19:21 +0300
commit39d14c0dd650f3de62242c2f92fb4d7a0ec3386a (patch)
tree4c600896eea221affb50aa2ff34a214868c38d7f /tools/perf/builtin-record.c
parentc7ba9d18ae47924a6ea6a47ca139779f58eb83c0 (diff)
parentfdd0ae72b34e56eb5e896d067c49a78ecb451032 (diff)
downloadlinux-39d14c0dd650f3de62242c2f92fb4d7a0ec3386a.tar.xz
Merge branch 'perf-tools' into perf-tools-next
To get some fixes in the perf test and JSON metrics into the development branch. Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Diffstat (limited to 'tools/perf/builtin-record.c')
-rw-r--r--tools/perf/builtin-record.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index c310eaad56ce..ff7e1d6cfcd2 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -4089,8 +4089,8 @@ int cmd_record(int argc, const char **argv)
}
if (rec->switch_output.num_files) {
- rec->switch_output.filenames = calloc(sizeof(char *),
- rec->switch_output.num_files);
+ rec->switch_output.filenames = calloc(rec->switch_output.num_files,
+ sizeof(char *));
if (!rec->switch_output.filenames) {
err = -EINVAL;
goto out_opts;