aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-10-17 10:38:33 +0200
committerTakashi Iwai <tiwai@suse.de>2010-10-17 10:38:33 +0200
commit84cc5c0bd3ef8711793cc0af2ecc3fb8e44f4ba0 (patch)
tree6774218cb21d5ffbe704d6ad6beadc8559aaed1c /tools
parentMerge remote branch 'alsa/devel' into topic/misc (diff)
parentALSA: rawmidi: fix oops (use after free) when unloading a driver module (diff)
downloadlinux-84cc5c0bd3ef8711793cc0af2ecc3fb8e44f4ba0.tar.gz
linux-84cc5c0bd3ef8711793cc0af2ecc3fb8e44f4ba0.zip
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/perf.h12
1 files changed, 12 insertions, 0 deletions
diff --git a/tools/perf/perf.h b/tools/perf/perf.h
index ef7aa0a0c526..95aaf565c704 100644
--- a/tools/perf/perf.h
+++ b/tools/perf/perf.h
@@ -73,6 +73,18 @@ void get_term_dimensions(struct winsize *ws);
#define cpu_relax() asm volatile("":::"memory")
#endif
+#ifdef __mips__
+#include "../../arch/mips/include/asm/unistd.h"
+#define rmb() asm volatile( \
+ ".set mips2\n\t" \
+ "sync\n\t" \
+ ".set mips0" \
+ : /* no output */ \
+ : /* no input */ \
+ : "memory")
+#define cpu_relax() asm volatile("" ::: "memory")
+#endif
+
#include <time.h>
#include <unistd.h>
#include <sys/types.h>