diff options
Diffstat (limited to 'tools/perf/perf.h')
-rw-r--r-- | tools/perf/perf.h | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/tools/perf/perf.h b/tools/perf/perf.h index 8f729aedc1a3..e5148e2b6134 100644 --- a/tools/perf/perf.h +++ b/tools/perf/perf.h | |||
@@ -1,7 +1,13 @@ | |||
1 | #ifndef _PERF_PERF_H | 1 | #ifndef _PERF_PERF_H |
2 | #define _PERF_PERF_H | 2 | #define _PERF_PERF_H |
3 | 3 | ||
4 | #if defined(__x86_64__) || defined(__i386__) | 4 | #if defined(__i386__) |
5 | #include "../../arch/x86/include/asm/unistd.h" | ||
6 | #define rmb() asm volatile("lock; addl $0,0(%%esp)" ::: "memory") | ||
7 | #define cpu_relax() asm volatile("rep; nop" ::: "memory"); | ||
8 | #endif | ||
9 | |||
10 | #if defined(__x86_64__) | ||
5 | #include "../../arch/x86/include/asm/unistd.h" | 11 | #include "../../arch/x86/include/asm/unistd.h" |
6 | #define rmb() asm volatile("lfence" ::: "memory") | 12 | #define rmb() asm volatile("lfence" ::: "memory") |
7 | #define cpu_relax() asm volatile("rep; nop" ::: "memory"); | 13 | #define cpu_relax() asm volatile("rep; nop" ::: "memory"); |
@@ -29,6 +35,12 @@ | |||
29 | #define cpu_relax() asm volatile("" ::: "memory") | 35 | #define cpu_relax() asm volatile("" ::: "memory") |
30 | #endif | 36 | #endif |
31 | 37 | ||
38 | #ifdef __hppa__ | ||
39 | #include "../../arch/parisc/include/asm/unistd.h" | ||
40 | #define rmb() asm volatile("" ::: "memory") | ||
41 | #define cpu_relax() asm volatile("" ::: "memory"); | ||
42 | #endif | ||
43 | |||
32 | #include <time.h> | 44 | #include <time.h> |
33 | #include <unistd.h> | 45 | #include <unistd.h> |
34 | #include <sys/types.h> | 46 | #include <sys/types.h> |
@@ -62,6 +74,8 @@ static inline unsigned long long rdclock(void) | |||
62 | #define __user | 74 | #define __user |
63 | #define asmlinkage | 75 | #define asmlinkage |
64 | 76 | ||
77 | #define __used __attribute__((__unused__)) | ||
78 | |||
65 | #define unlikely(x) __builtin_expect(!!(x), 0) | 79 | #define unlikely(x) __builtin_expect(!!(x), 0) |
66 | #define min(x, y) ({ \ | 80 | #define min(x, y) ({ \ |
67 | typeof(x) _min1 = (x); \ | 81 | typeof(x) _min1 = (x); \ |