Merge tag 'wberr-v4.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton...

[sfrench/cifs-2.6.git] / tools / perf / perf-sys.h

diff --git a/tools/perf/perf-sys.h b/tools/perf/perf-sys.h
index e4b717e9eb6cf532c2d9c823c1b8f71e8da4256b..c11f0c76e90c78aa0eef8f436f59d842ce0c2201 100644 (file)
--- a/tools/perf/perf-sys.h
+++ b/tools/perf/perf-sys.h
@@ -9,16 +9,6 @@
 #include <linux/perf_event.h>
 #include <asm/barrier.h>
 
-#if defined(__i386__)
-#define cpu_relax()    asm volatile("rep; nop" ::: "memory");
-#define CPUINFO_PROC   {"model name"}
-#endif
-
-#if defined(__x86_64__)
-#define cpu_relax()    asm volatile("rep; nop" ::: "memory");
-#define CPUINFO_PROC   {"model name"}
-#endif
-
 #ifdef __powerpc__
 #define CPUINFO_PROC   {"cpu"}
 #endif
@@ -43,19 +33,10 @@
 #define CPUINFO_PROC   {"cpu model"}
 #endif
 
-#ifdef __ia64__
-#define cpu_relax()    asm volatile ("hint @pause" ::: "memory")
-#define CPUINFO_PROC   {"model name"}
-#endif
-
 #ifdef __arm__
 #define CPUINFO_PROC   {"model name", "Processor"}
 #endif
 
-#ifdef __aarch64__
-#define cpu_relax()    asm volatile("yield" ::: "memory")
-#endif
-
 #ifdef __mips__
 #define CPUINFO_PROC   {"cpu model"}
 #endif
@@ -72,13 +53,8 @@
 #define CPUINFO_PROC   {"core ID"}
 #endif
 
-#ifdef __tile__
-#define cpu_relax()    asm volatile ("mfspr zero, PASS" ::: "memory")
-#define CPUINFO_PROC    {"model name"}
-#endif
-
-#ifndef cpu_relax
-#define cpu_relax() barrier()
+#ifndef CPUINFO_PROC
+#define CPUINFO_PROC   { "model name", }
 #endif
 
 static inline int