summaryrefslogtreecommitdiffstats
path: root/tools/perf/perf.h
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-08-25 15:40:29 -0700
committerH. Peter Anvin <hpa@zytor.com>2009-08-25 15:40:29 -0700
commite8a2eb47e6ca03d4a4f98f0beef73720c5dddc0c (patch)
tree31c4d7718111abddfaaa8d3fb14ab4a7e2554cd9 /tools/perf/perf.h
parent8b5a10fc6fd02289ea03480f93382b1a99006142 (diff)
parentc62e43202e7cf50ca24bce58b255df7bf5de69d0 (diff)
downloadtalos-obmc-linux-e8a2eb47e6ca03d4a4f98f0beef73720c5dddc0c.tar.gz
talos-obmc-linux-e8a2eb47e6ca03d4a4f98f0beef73720c5dddc0c.zip
Merge commit 'origin/x86/urgent' into x86/asm
Diffstat (limited to 'tools/perf/perf.h')
-rw-r--r--tools/perf/perf.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/tools/perf/perf.h b/tools/perf/perf.h
index 63e67cc5487b..e5148e2b6134 100644
--- a/tools/perf/perf.h
+++ b/tools/perf/perf.h
@@ -1,7 +1,13 @@
#ifndef _PERF_PERF_H
#define _PERF_PERF_H
-#if defined(__x86_64__) || defined(__i386__)
+#if defined(__i386__)
+#include "../../arch/x86/include/asm/unistd.h"
+#define rmb() asm volatile("lock; addl $0,0(%%esp)" ::: "memory")
+#define cpu_relax() asm volatile("rep; nop" ::: "memory");
+#endif
+
+#if defined(__x86_64__)
#include "../../arch/x86/include/asm/unistd.h"
#define rmb() asm volatile("lfence" ::: "memory")
#define cpu_relax() asm volatile("rep; nop" ::: "memory");
OpenPOWER on IntegriCloud