public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-10-31 08:44:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

perf tools: Use default CPUINFO_PROC where it fits

Browse source 
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>
This commit is contained in:
Arnaldo Carvalho de Melo 2017-08-17 16:58:21 -03:00
parent 4717e03cc7
commit 9a57eaf1d2
2 changed files with 2 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
tools/perf/perf-sys.h
View file

@ -9,14 +9,6 @@
#include <linux/perf_event.h> #include <linux/perf_event.h>
#include <asm/barrier.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__ #ifdef __powerpc__
#define CPUINFO_PROC {"cpu"} #define CPUINFO_PROC {"cpu"}
#endif #endif
@ -41,17 +33,10 @@
#define CPUINFO_PROC {"cpu model"} #define CPUINFO_PROC {"cpu model"}
#endif #endif
#ifdef __ia64__
#define CPUINFO_PROC {"model name"}
#endif
#ifdef __arm__ #ifdef __arm__
#define CPUINFO_PROC {"model name", "Processor"} #define CPUINFO_PROC {"model name", "Processor"}
#endif #endif
#ifdef __aarch64__
#endif
#ifdef __mips__ #ifdef __mips__
#define CPUINFO_PROC {"cpu model"} #define CPUINFO_PROC {"cpu model"}
#endif #endif
@ -68,8 +53,8 @@
#define CPUINFO_PROC {"core ID"} #define CPUINFO_PROC {"core ID"}
#endif #endif
#ifdef __tile__ #ifndef CPUINFO_PROC
#define CPUINFO_PROC {"model name"} #define CPUINFO_PROC { "model name", }
#endif #endif
static inline int static inline int

3
tools/perf/util/header.c
View file

@ -380,9 +380,6 @@ done:
static int write_cpudesc(struct feat_fd *ff, static int write_cpudesc(struct feat_fd *ff,
struct perf_evlist *evlist __maybe_unused) struct perf_evlist *evlist __maybe_unused)
{ {
#ifndef CPUINFO_PROC
#define CPUINFO_PROC {"model name", }
#endif
const char *cpuinfo_procs[] = CPUINFO_PROC; const char *cpuinfo_procs[] = CPUINFO_PROC;
unsigned int i; unsigned int i;