diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-10-18 11:25:09 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-10-18 11:25:09 -0400 |
| commit | db181a8ee158fd0ccea2e2670c4f2d36af2814a0 (patch) | |
| tree | d03adc3926b4aca7ee172d825b90fe965b4f01b9 /tools | |
| parent | ee2007d299ad4020115b193858817e6c57e95db5 (diff) | |
| parent | 9c0a788b4315b83f6138ffa15c56ccf541106e58 (diff) | |
Merge branch 'for-spi' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin into spi/next
Diffstat (limited to 'tools')
| -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 ef7aa0a0c526..95aaf565c704 100644 --- a/tools/perf/perf.h +++ b/tools/perf/perf.h | |||
| @@ -73,6 +73,18 @@ void get_term_dimensions(struct winsize *ws); | |||
| 73 | #define cpu_relax() asm volatile("":::"memory") | 73 | #define cpu_relax() asm volatile("":::"memory") |
| 74 | #endif | 74 | #endif |
| 75 | 75 | ||
| 76 | #ifdef __mips__ | ||
| 77 | #include "../../arch/mips/include/asm/unistd.h" | ||
| 78 | #define rmb() asm volatile( \ | ||
| 79 | ".set mips2\n\t" \ | ||
| 80 | "sync\n\t" \ | ||
| 81 | ".set mips0" \ | ||
| 82 | : /* no output */ \ | ||
| 83 | : /* no input */ \ | ||
| 84 | : "memory") | ||
| 85 | #define cpu_relax() asm volatile("" ::: "memory") | ||
| 86 | #endif | ||
| 87 | |||
| 76 | #include <time.h> | 88 | #include <time.h> |
| 77 | #include <unistd.h> | 89 | #include <unistd.h> |
| 78 | #include <sys/types.h> | 90 | #include <sys/types.h> |