diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-01 11:46:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-01 11:46:30 -0700 |
| commit | 5a475ce4692f668b2615ae4ea1365c7c2d93f1dd (patch) | |
| tree | 0349690bce5fe2396a3788bb1a4084ffd87ee308 /tools/perf | |
| parent | d960eea974f5e500c0dcb95a934239cc1f481cfd (diff) | |
| parent | 1c6a307a54668eda556f499c94e75086aaf8f80f (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: LCDC dcache flush for deferred io
sh: Fix compiler error and include the definition of IS_ERR_VALUE
sh: re-add LCDC fbdev support to the Migo-R defconfig
sh: fix se7724 ceu names
sh: ms7724se: Enable sh_eth in defconfig.
arch/sh/boards/mach-se/7206/io.c: Remove unnecessary semicolons
sh: ms7724se: Add sh_eth support
nommu: provide follow_pfn().
sh: Kill off unused DEBUG_BOOTMEM symbol.
perf_counter tools: add cpu_relax()/rmb() definitions for sh.
sh64: Hook up page fault events for software perf counters.
sh: Hook up page fault events for software perf counters.
sh: make set_perf_counter_pending() static inline.
clocksource: sh_tmu: Make undefined TCOR behaviour less undefined.
Diffstat (limited to 'tools/perf')
| -rw-r--r-- | tools/perf/perf.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/tools/perf/perf.h b/tools/perf/perf.h index ce394192c85a..8f729aedc1a3 100644 --- a/tools/perf/perf.h +++ b/tools/perf/perf.h @@ -19,6 +19,16 @@ #define cpu_relax() asm volatile("" ::: "memory"); #endif +#ifdef __sh__ +#include "../../arch/sh/include/asm/unistd.h" +#if defined(__SH4A__) || defined(__SH5__) +# define rmb() asm volatile("synco" ::: "memory") +#else +# define rmb() asm volatile("" ::: "memory") +#endif +#define cpu_relax() asm volatile("" ::: "memory") +#endif + #include <time.h> #include <unistd.h> #include <sys/types.h> |