diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-03-01 11:12:38 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-03-01 11:12:38 +1100 |
| commit | 4c3e4f3ba86366b4c23b1c24ea46a4689f341d43 (patch) | |
| tree | cc9d8da895ef124323a54f6501ce348ca612f437 /tools/perf | |
| parent | bb48acd5c9bafa7d95c303f02a56dbb1f0bd5e5c (diff) | |
| parent | 8ccfe6675fa974bd06d64f74d0fdee6a5267d2aa (diff) | |
Merge remote-tracking branch 'arc/for-next'
Conflicts:
init/Kconfig
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 c2206c87fc9f..d5818c98d051 100644 --- a/tools/perf/perf.h +++ b/tools/perf/perf.h @@ -94,6 +94,12 @@ #define CPUINFO_PROC "cpu model" #endif +#ifdef __arc__ +#define rmb() asm volatile("" ::: "memory") +#define cpu_relax() rmb() +#define CPUINFO_PROC "Processor" +#endif + #include <time.h> #include <unistd.h> #include <sys/types.h> |