Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a57eaf1 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 4717e03c

tools/perf/perf-sys.h

+2 −17
Original line number Diff line number Diff line
@@ -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

tools/perf/util/header.c

+0 −3
Original line number Diff line number Diff line
@@ -380,9 +380,6 @@ static int __write_cpudesc(struct feat_fd *ff, const char *cpuinfo_proc) 
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;