perf kvm: Move kvm-stat header file from conditional inclusion to common include...

[linux-2.6-block.git] / tools / perf / builtin-sched.c

diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c
index 897d11c8ca2e49677265bb605cda7dc21a6a3458..f0b828c201ccdefc07904cb9977516a1090e96aa 100644 (file)
--- a/tools/perf/builtin-sched.c
+++ b/tools/perf/builtin-sched.c
@@ -1,9 +1,10 @@
 // SPDX-License-Identifier: GPL-2.0
 #include "builtin.h"
 #include "perf.h"
+#include "perf-sys.h"
 
+#include "util/cpumap.h"
 #include "util/evlist.h"
-#include "util/cache.h"
 #include "util/evsel.h"
 #include "util/symbol.h"
 #include "util/thread.h"
@@ -18,10 +19,12 @@
 #include "util/callchain.h"
 #include "util/time-utils.h"
 
+#include <subcmd/pager.h>
 #include <subcmd/parse-options.h>
 #include "util/trace-event.h"
 
 #include "util/debug.h"
+#include "util/event.h"
 
 #include <linux/kernel.h>
 #include <linux/log2.h>
@@ -35,6 +38,7 @@
 #include <pthread.h>
 #include <math.h>
 #include <api/fs/fs.h>
+#include <perf/cpumap.h>
 #include <linux/time64.h>
 
 #include <linux/ctype.h>
@@ -2643,7 +2647,7 @@ static int process_lost(struct perf_tool *tool __maybe_unused,
 
        timestamp__scnprintf_usec(sample->time, tstr, sizeof(tstr));
        printf("%15s ", tstr);
-       printf("lost %" PRIu64 " events on cpu %d\n", event->lost.lost, sample->cpu);
+       printf("lost %" PRI_lu64 " events on cpu %d\n", event->lost.lost, sample->cpu);
 
        return 0;
 }
@@ -3183,7 +3187,7 @@ static int setup_map_cpus(struct perf_sched *sched)
        if (!sched->map.cpus_str)
                return 0;
 
-       map = cpu_map__new(sched->map.cpus_str);
+       map = perf_cpu_map__new(sched->map.cpus_str);
        if (!map) {
                pr_err("failed to get cpus map from %s\n", sched->map.cpus_str);
                return -1;
@@ -3217,7 +3221,7 @@ static int setup_color_cpus(struct perf_sched *sched)
        if (!sched->map.color_cpus_str)
                return 0;
 
-       map = cpu_map__new(sched->map.color_cpus_str);
+       map = perf_cpu_map__new(sched->map.color_cpus_str);
        if (!map) {
                pr_err("failed to get thread map from %s\n", sched->map.color_cpus_str);
                return -1;