]> www.infradead.org Git - linux.git/commitdiff
perf daemon: Fix the build on 32-bit architectures
authorArnaldo Carvalho de Melo <arnaldo.melo@gmail.com>
Thu, 18 Jul 2024 19:38:07 +0000 (16:38 -0300)
committerNamhyung Kim <namhyung@kernel.org>
Sat, 10 Aug 2024 02:36:20 +0000 (19:36 -0700)
Noticed with:

   1     6.22 debian:experimental-x-mipsel  : FAIL gcc version 13.2.0 (Debian 13.2.0-25)
    builtin-daemon.c: In function 'cmd_session_list':
    builtin-daemon.c:691:35: error: format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'time_t' {aka 'long long int'} [-Werror=format=]

Use inttypes.h's PRIu64 to deal with that.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Link: https://lore.kernel.org/r/ZplvH21aQ8pzmza_@x1
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
tools/perf/builtin-daemon.c

index de76bbc50bfbcbb6323bef3f67a8953c1978d03e..5c9335fff2d396b435ba877b82c2494e049858ea 100644 (file)
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 #include <internal/lib.h>
+#include <inttypes.h>
 #include <subcmd/parse-options.h>
 #include <api/fd/array.h>
 #include <api/fs/fs.h>
@@ -688,7 +689,7 @@ static int cmd_session_list(struct daemon *daemon, union cmd *cmd, FILE *out)
                        /* lock */
                        csv_sep, daemon->base, "lock");
 
-               fprintf(out, "%c%lu",
+               fprintf(out, "%c%" PRIu64,
                        /* session up time */
                        csv_sep, (curr - daemon->start) / 60);
 
@@ -700,7 +701,7 @@ static int cmd_session_list(struct daemon *daemon, union cmd *cmd, FILE *out)
                                daemon->base, SESSION_OUTPUT);
                        fprintf(out, "  lock:    %s/lock\n",
                                daemon->base);
-                       fprintf(out, "  up:      %lu minutes\n",
+                       fprintf(out, "  up:      %" PRIu64 " minutes\n",
                                (curr - daemon->start) / 60);
                }
        }
@@ -727,7 +728,7 @@ static int cmd_session_list(struct daemon *daemon, union cmd *cmd, FILE *out)
                                /* session ack */
                                csv_sep, session->base, SESSION_ACK);
 
-                       fprintf(out, "%c%lu",
+                       fprintf(out, "%c%" PRIu64,
                                /* session up time */
                                csv_sep, (curr - session->start) / 60);
 
@@ -745,7 +746,7 @@ static int cmd_session_list(struct daemon *daemon, union cmd *cmd, FILE *out)
                                session->base, SESSION_CONTROL);
                        fprintf(out, "  ack:     %s/%s\n",
                                session->base, SESSION_ACK);
-                       fprintf(out, "  up:      %lu minutes\n",
+                       fprintf(out, "  up:      %" PRIu64 " minutes\n",
                                (curr - session->start) / 60);
                }
        }