diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2017-08-17 16:58:21 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2017-08-17 16:58:21 -0300 |
| commit | 9a57eaf1d2443d34cce0562f425228c37a8ec019 (patch) | |
| tree | 1a34d2c6e0d65ca5c7e62c32084ff0a22fa1597a | |
| parent | 4717e03cc7e826818c3f9bd60e9c304a3309c3ad (diff) | |
perf tools: Use default CPUINFO_PROC where it fits
Several architectures don't need to define it since the string is the
same as the default one, so nuke them.
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-v1e1jr1u474w9xcelpaoxamu@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
| -rw-r--r-- | tools/perf/perf-sys.h | 19 | ||||
| -rw-r--r-- | tools/perf/util/header.c | 3 |
2 files changed, 2 insertions, 20 deletions
diff --git a/tools/perf/perf-sys.h b/tools/perf/perf-sys.h index 2aaa7366cdc2..c11f0c76e90c 100644 --- a/tools/perf/perf-sys.h +++ b/tools/perf/perf-sys.h @@ -9,14 +9,6 @@ #include <linux/perf_event.h> #include <asm/barrier.h> -#if defined(__i386__) -#define CPUINFO_PROC {"model name"} -#endif - -#if defined(__x86_64__) -#define CPUINFO_PROC {"model name"} -#endif - #ifdef __powerpc__ #define CPUINFO_PROC {"cpu"} #endif @@ -41,17 +33,10 @@ #define CPUINFO_PROC {"cpu model"} #endif -#ifdef __ia64__ -#define CPUINFO_PROC {"model name"} -#endif - #ifdef __arm__ #define CPUINFO_PROC {"model name", "Processor"} #endif -#ifdef __aarch64__ -#endif - #ifdef __mips__ #define CPUINFO_PROC {"cpu model"} #endif @@ -68,8 +53,8 @@ #define CPUINFO_PROC {"core ID"} #endif -#ifdef __tile__ -#define CPUINFO_PROC {"model name"} +#ifndef CPUINFO_PROC +#define CPUINFO_PROC { "model name", } #endif static inline int diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index 28bf4442d577..605bbd5404fb 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -380,9 +380,6 @@ done: static int write_cpudesc(struct feat_fd *ff, struct perf_evlist *evlist __maybe_unused) { -#ifndef CPUINFO_PROC -#define CPUINFO_PROC {"model name", } -#endif const char *cpuinfo_procs[] = CPUINFO_PROC; unsigned int i; |