diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-19 11:27:32 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-19 11:28:41 +0200 |
| commit | 929bf0d0156562ce631728b6fa53d68004d456d2 (patch) | |
| tree | 739063990a8077b29ef97e69d73bce94573daae4 /tools | |
| parent | sched_clock: Make it NMI safe (diff) | |
| parent | pty_write: don't do a tty_wakeup() when the buffers are full (diff) | |
| download | linux-929bf0d0156562ce631728b6fa53d68004d456d2.tar.xz linux-929bf0d0156562ce631728b6fa53d68004d456d2.zip | |
Merge branch 'linus' into perfcounters/core
Merge reason: Bring in tracing changes we depend on.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools')
| -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 e5148e2b6134..2abeb20d0bf3 100644 --- a/tools/perf/perf.h +++ b/tools/perf/perf.h @@ -41,6 +41,12 @@ #define cpu_relax() asm volatile("" ::: "memory"); #endif +#ifdef __sparc__ +#include "../../arch/sparc/include/asm/unistd.h" +#define rmb() asm volatile("":::"memory") +#define cpu_relax() asm volatile("":::"memory") +#endif + #include <time.h> #include <unistd.h> #include <sys/types.h> |