libperf: Add perf_cpu_map__get()/perf_cpu_map__put()

[mirror_ubuntu-focal-kernel.git] / tools / perf / util / env.c

diff --git a/tools/perf/util/env.c b/tools/perf/util/env.c
index 22eee8942527a27e52adef024b1c3dc0ba752f69..d77912b2b5e725ab64de2634794eed82a9908cb0 100644 (file)
--- a/tools/perf/util/env.c
+++ b/tools/perf/util/env.c
@@ -2,11 +2,12 @@
 #include "cpumap.h"
 #include "env.h"
 #include <linux/ctype.h>
-#include "util.h"
+#include <linux/zalloc.h>
 #include "bpf-event.h"
 #include <errno.h>
 #include <sys/utsname.h>
 #include <bpf/libbpf.h>
+#include <stdlib.h>
 
 struct perf_env perf_env;
 
@@ -178,7 +179,7 @@ void perf_env__exit(struct perf_env *env)
        zfree(&env->cpu);
 
        for (i = 0; i < env->nr_numa_nodes; i++)
-               cpu_map__put(env->numa_nodes[i].map);
+               perf_cpu_map__put(env->numa_nodes[i].map);
        zfree(&env->numa_nodes);
 
        for (i = 0; i < env->caches_cnt; i++)
@@ -186,7 +187,7 @@ void perf_env__exit(struct perf_env *env)
        zfree(&env->caches);
 
        for (i = 0; i < env->nr_memory_nodes; i++)
-               free(env->memory_nodes[i].set);
+               zfree(&env->memory_nodes[i].set);
        zfree(&env->memory_nodes);
 }
 
@@ -286,9 +287,9 @@ int perf_env__nr_cpus_avail(struct perf_env *env)
 
 void cpu_cache_level__free(struct cpu_cache_level *cache)
 {
-       free(cache->type);
-       free(cache->map);
-       free(cache->size);
+       zfree(&cache->type);
+       zfree(&cache->map);
+       zfree(&cache->size);
 }
 
 /*