Merge branch 'for-5.16' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[linux-2.6-microblaze.git] / tools / perf / builtin-daemon.c

diff --git a/tools/perf/builtin-daemon.c b/tools/perf/builtin-daemon.c
index 61929f6..6cb3f6c 100644 (file)
--- a/tools/perf/builtin-daemon.c
+++ b/tools/perf/builtin-daemon.c
@@ -1121,8 +1121,6 @@ static int setup_config(struct daemon *daemon)
 #ifndef F_TLOCK
 #define F_TLOCK 2
 
-#include <sys/file.h>
-
 static int lockf(int fd, int cmd, off_t len)
 {
        if (cmd != F_TLOCK || len != 0)
@@ -1403,8 +1401,10 @@ out:
 
 static int send_cmd_list(struct daemon *daemon)
 {
-       union cmd cmd = { .cmd = CMD_LIST, };
+       union cmd cmd;
 
+       memset(&cmd, 0, sizeof(cmd));
+       cmd.list.cmd = CMD_LIST;
        cmd.list.verbose = verbose;
        cmd.list.csv_sep = daemon->csv_sep ? *daemon->csv_sep : 0;
 
@@ -1432,6 +1432,7 @@ static int __cmd_signal(struct daemon *daemon, struct option parent_options[],
                return -1;
        }
 
+       memset(&cmd, 0, sizeof(cmd));
        cmd.signal.cmd = CMD_SIGNAL,
        cmd.signal.sig = SIGUSR2;
        strncpy(cmd.signal.name, name, sizeof(cmd.signal.name) - 1);
@@ -1446,7 +1447,7 @@ static int __cmd_stop(struct daemon *daemon, struct option parent_options[],
                OPT_PARENT(parent_options),
                OPT_END()
        };
-       union cmd cmd = { .cmd = CMD_STOP, };
+       union cmd cmd;
 
        argc = parse_options(argc, argv, start_options, daemon_usage, 0);
        if (argc)
@@ -1457,6 +1458,8 @@ static int __cmd_stop(struct daemon *daemon, struct option parent_options[],
                return -1;
        }
 
+       memset(&cmd, 0, sizeof(cmd));
+       cmd.cmd = CMD_STOP;
        return send_cmd(daemon, &cmd);
 }
 
@@ -1470,7 +1473,7 @@ static int __cmd_ping(struct daemon *daemon, struct option parent_options[],
                OPT_PARENT(parent_options),
                OPT_END()
        };
-       union cmd cmd = { .cmd = CMD_PING, };
+       union cmd cmd;
 
        argc = parse_options(argc, argv, ping_options, daemon_usage, 0);
        if (argc)
@@ -1481,6 +1484,8 @@ static int __cmd_ping(struct daemon *daemon, struct option parent_options[],
                return -1;
        }
 
+       memset(&cmd, 0, sizeof(cmd));
+       cmd.cmd = CMD_PING;
        scnprintf(cmd.ping.name, sizeof(cmd.ping.name), "%s", name);
        return send_cmd(daemon, &cmd);
 }