diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /tools/perf/perf.h | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'tools/perf/perf.h')
| -rw-r--r-- | tools/perf/perf.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/tools/perf/perf.h b/tools/perf/perf.h index 8cc4623afd6f..454d5d55f32d 100644 --- a/tools/perf/perf.h +++ b/tools/perf/perf.h | |||
| @@ -47,6 +47,18 @@ | |||
| 47 | #define cpu_relax() asm volatile("":::"memory") | 47 | #define cpu_relax() asm volatile("":::"memory") |
| 48 | #endif | 48 | #endif |
| 49 | 49 | ||
| 50 | #ifdef __alpha__ | ||
| 51 | #include "../../arch/alpha/include/asm/unistd.h" | ||
| 52 | #define rmb() asm volatile("mb" ::: "memory") | ||
| 53 | #define cpu_relax() asm volatile("" ::: "memory") | ||
| 54 | #endif | ||
| 55 | |||
| 56 | #ifdef __ia64__ | ||
| 57 | #include "../../arch/ia64/include/asm/unistd.h" | ||
| 58 | #define rmb() asm volatile ("mf" ::: "memory") | ||
| 59 | #define cpu_relax() asm volatile ("hint @pause" ::: "memory") | ||
| 60 | #endif | ||
| 61 | |||
| 50 | #include <time.h> | 62 | #include <time.h> |
| 51 | #include <unistd.h> | 63 | #include <unistd.h> |
| 52 | #include <sys/types.h> | 64 | #include <sys/types.h> |