diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-03-01 11:15:57 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-03-01 11:15:57 +1100 |
| commit | 5607534cd762077514c0a272a5d2039073da3ffc (patch) | |
| tree | 823852293b3d49b7c775b25ba9ffd9fd6c3419a0 /tools/perf | |
| parent | 88053f4c46a330cc4189a36b47a674273f2ffe88 (diff) | |
| parent | 2149e40998b5c9bbee62a5bf97e04f28feb27ba8 (diff) | |
Merge remote-tracking branch 'metag/for-next'
Conflicts:
drivers/clocksource/Kconfig
drivers/clocksource/Makefile
drivers/irqchip/Makefile
tools/perf/perf.h
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 d5818c98d051..74659ecf93e0 100644 --- a/tools/perf/perf.h +++ b/tools/perf/perf.h @@ -100,6 +100,12 @@ #define CPUINFO_PROC "Processor" #endif +#ifdef __metag__ +#define rmb() asm volatile("" ::: "memory") +#define cpu_relax() asm volatile("" ::: "memory") +#define CPUINFO_PROC "CPU" +#endif + #include <time.h> #include <unistd.h> #include <sys/types.h> |