Commit 87ffb6c6 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf env: Remove needless cpumap.h header 

Only a 'struct perf_cmp_map' forward allocation is necessary, fix the
places that need the header but were getting it indirectly, by luck,
from env.h.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lkml.kernel.org/n/tip-3sj3n534zghxhk7ygzeaqlx9@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 09aa3b00

tools/perf/arch/arm64/util/header.c

+3 −1
Original line number Diff line number Diff line 
#include <stdio.h>

#include <stdlib.h>

#include <perf/cpumap.h>

#include <internal/cpumap.h>

#include <api/fs/fs.h>

#include "debug.h"

#include "header.h"
@@ -29,7 +31,7 @@ char *get_cpuid_str(struct perf_pmu *pmu) 


	/* read midr from list of cpus mapped to this pmu */

	cpus = perf_cpu_map__get(pmu->cpus);

	for (cpu = 0; cpu < cpus->nr; cpu++) {

	for (cpu = 0; cpu < perf_cpu_map__nr(cpus); cpu++) {

		scnprintf(path, PATH_MAX, "%s/devices/system/cpu/cpu%d"MIDR,

				sysfs, cpus->map[cpu]);

tools/perf/arch/x86/tests/perf-time-to-tsc.c

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include "evlist.h"

#include "evsel.h"

#include "thread_map.h"

#include "cpumap.h"

#include "record.h"

#include "tsc.h"

#include "tests/tests.h"

tools/perf/bench/epoll-ctl.c

+1 −1
Original line number Diff line number Diff line
@@ -21,12 +21,12 @@ 
#include <sys/resource.h>

#include <sys/epoll.h>

#include <sys/eventfd.h>

#include <internal/cpumap.h>

#include <perf/cpumap.h>



#include "../util/stat.h"

#include <subcmd/parse-options.h>

#include "bench.h"

#include "cpumap.h"



#include <err.h>

tools/perf/bench/epoll-wait.c

+1 −1
Original line number Diff line number Diff line
@@ -76,12 +76,12 @@ 
#include <sys/epoll.h>

#include <sys/eventfd.h>

#include <sys/types.h>

#include <internal/cpumap.h>

#include <perf/cpumap.h>



#include "../util/stat.h"

#include <subcmd/parse-options.h>

#include "bench.h"

#include "cpumap.h"



#include <err.h>

tools/perf/bench/futex-hash.c

+1 −1
Original line number Diff line number Diff line
@@ -20,13 +20,13 @@ 
#include <linux/kernel.h>

#include <linux/zalloc.h>

#include <sys/time.h>

#include <internal/cpumap.h>

#include <perf/cpumap.h>



#include "../util/stat.h"

#include <subcmd/parse-options.h>

#include "bench.h"

#include "futex.h"

#include "cpumap.h"



#include <err.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE