diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-09-19 05:27:32 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-09-19 05:28:41 -0400 |
commit | 929bf0d0156562ce631728b6fa53d68004d456d2 (patch) | |
tree | 739063990a8077b29ef97e69d73bce94573daae4 /tools/perf | |
parent | def0a9b2573e00ab0b486cb5382625203ab4c4a6 (diff) | |
parent | 202c4675c55ddf6b443c7e057d2dff6b42ef71aa (diff) |
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/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 e5148e2b6134..2abeb20d0bf3 100644 --- a/tools/perf/perf.h +++ b/tools/perf/perf.h | |||
@@ -41,6 +41,12 @@ | |||
41 | #define cpu_relax() asm volatile("" ::: "memory"); | 41 | #define cpu_relax() asm volatile("" ::: "memory"); |
42 | #endif | 42 | #endif |
43 | 43 | ||
44 | #ifdef __sparc__ | ||
45 | #include "../../arch/sparc/include/asm/unistd.h" | ||
46 | #define rmb() asm volatile("":::"memory") | ||
47 | #define cpu_relax() asm volatile("":::"memory") | ||
48 | #endif | ||
49 | |||
44 | #include <time.h> | 50 | #include <time.h> |
45 | #include <unistd.h> | 51 | #include <unistd.h> |
46 | #include <sys/types.h> | 52 | #include <sys/types.h> |