Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / tools / perf / arch / arm64 / util / header.c

diff --git a/tools/perf/arch/arm64/util/header.c b/tools/perf/arch/arm64/util/header.c
index 534cd2507d830a3380c3309778270e691c1eb348..e41defaaa2e686bebb5a6e3d5441e101de0459bd 100644 (file)
--- a/tools/perf/arch/arm64/util/header.c
+++ b/tools/perf/arch/arm64/util/header.c
@@ -1,6 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <api/fs/fs.h>
+#include "debug.h"
 #include "header.h"
 
 #define MIDR "/regs/identification/midr_el1"
@@ -16,7 +17,7 @@ char *get_cpuid_str(struct perf_pmu *pmu)
        const char *sysfs = sysfs__mountpoint();
        int cpu;
        u64 midr = 0;
-       struct cpu_map *cpus;
+       struct perf_cpu_map *cpus;
        FILE *file;
 
        if (!sysfs || !pmu || !pmu->cpus)
@@ -27,7 +28,7 @@ char *get_cpuid_str(struct perf_pmu *pmu)
                return NULL;
 
        /* read midr from list of cpus mapped to this pmu */
-       cpus = cpu_map__get(pmu->cpus);
+       cpus = perf_cpu_map__get(pmu->cpus);
        for (cpu = 0; cpu < cpus->nr; cpu++) {
                scnprintf(path, PATH_MAX, "%s/devices/system/cpu/cpu%d"MIDR,
                                sysfs, cpus->map[cpu]);
@@ -60,6 +61,6 @@ char *get_cpuid_str(struct perf_pmu *pmu)
                buf = NULL;
        }
 
-       cpu_map__put(cpus);
+       perf_cpu_map__put(cpus);
        return buf;
 }