openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

perf header: Move CPUINFO_PROC to the only file where it is used 

To reduce perf-sys.h and eventually nuke it.

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-ars2j5m3if3gypsvkbbijucq@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo 2019-08-29 14:40:28 -03:00
parent 108a1bb9d1
commit a774940263
2 changed files with 18 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
tools/perf/perf-sys.h
View File

@ -10,50 +10,6 @@
#include <linux/perf_event.h>
#include <asm/barrier.h>
#ifdef __powerpc__
#define CPUINFO_PROC {"cpu"}
#endif
#ifdef __s390__
#define CPUINFO_PROC {"vendor_id"}
#endif
#ifdef __sh__
#define CPUINFO_PROC {"cpu type"}
#endif
#ifdef __hppa__
#define CPUINFO_PROC {"cpu"}
#endif
#ifdef __sparc__
#define CPUINFO_PROC {"cpu"}
#endif
#ifdef __alpha__
#define CPUINFO_PROC {"cpu model"}
#endif
#ifdef __arm__
#define CPUINFO_PROC {"model name", "Processor"}
#endif
#ifdef __mips__
#define CPUINFO_PROC {"cpu model"}
#endif
#ifdef __arc__
#define CPUINFO_PROC {"Processor"}
#endif
#ifdef __xtensa__
#define CPUINFO_PROC {"core ID"}
#endif
#ifndef CPUINFO_PROC
#define CPUINFO_PROC { "model name", }
#endif
static inline int
sys_perf_event_open(struct perf_event_attr *attr,
pid_t pid, int cpu, int group_fd,

18
tools/perf/util/header.c
View File

@ -436,7 +436,25 @@ static int __write_cpudesc(struct feat_fd *ff, const char *cpuinfo_proc)
static int write_cpudesc(struct feat_fd *ff,
struct evlist *evlist __maybe_unused)
{
#if defined(__powerpc__) || defined(__hppa__) || defined(__sparc__)
#define CPUINFO_PROC { "cpu", }
#elif defined(__s390__)
#define CPUINFO_PROC { "vendor_id", }
#elif defined(__sh__)
#define CPUINFO_PROC { "cpu type", }
#elif defined(__alpha__) || defined(__mips__)
#define CPUINFO_PROC { "cpu model", }
#elif defined(__arm__)
#define CPUINFO_PROC { "model name", "Processor", }
#elif defined(__arc__)
#define CPUINFO_PROC { "Processor", }
#elif defined(__xtensa__)
#define CPUINFO_PROC { "core ID", }
#else
#define CPUINFO_PROC { "model name", }
#endif
const char *cpuinfo_procs[] = CPUINFO_PROC;
#undef CPUINFO_PROC
unsigned int i;
for (i = 0; i < ARRAY_SIZE(cpuinfo_procs); i++) {