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>

diff --git a/tools/perf/perf-sys.h b/tools/perf/perf-sys.h
index 2aaa7366cdc2f5b58fdfd6b74a5d379011452802..c11f0c76e90c78aa0eef8f436f59d842ce0c2201 100644 (file)
--- 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 28bf4442d577f68d27d0136c3bb75970ca9781d7..605bbd5404fb36e7fc8d61ee7d99e66f1b65ba7a 100644 (file)
--- 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;