diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-07-06 22:55:05 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-07-06 22:55:05 -0400 |
| commit | 2b5c0c72ea404d6b554a8284031dd78748314b9e (patch) | |
| tree | 468b7f3d8db0abe6a09ee221dce1de5de2bb8d12 /tools/perf | |
| parent | 2dbc8a23cc2e677422f6dea991aca4e3d31ab65f (diff) | |
| parent | dc53fffc105f68cb08ca872acd51550e89aa2e67 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh/for-2.6.31
Diffstat (limited to 'tools/perf')
| -rw-r--r-- | tools/perf/perf.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/perf/perf.h b/tools/perf/perf.h index 8f729aedc1a3..d3042a6ba03d 100644 --- a/tools/perf/perf.h +++ b/tools/perf/perf.h | |||
| @@ -29,6 +29,12 @@ | |||
| 29 | #define cpu_relax() asm volatile("" ::: "memory") | 29 | #define cpu_relax() asm volatile("" ::: "memory") |
| 30 | #endif | 30 | #endif |
| 31 | 31 | ||
| 32 | #ifdef __hppa__ | ||
| 33 | #include "../../arch/parisc/include/asm/unistd.h" | ||
| 34 | #define rmb() asm volatile("" ::: "memory") | ||
| 35 | #define cpu_relax() asm volatile("" ::: "memory"); | ||
| 36 | #endif | ||
| 37 | |||
| 32 | #include <time.h> | 38 | #include <time.h> |
| 33 | #include <unistd.h> | 39 | #include <unistd.h> |
| 34 | #include <sys/types.h> | 40 | #include <sys/types.h> |