aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf
diff options
context:
space:
mode:
authorLuck, Tony <tony.luck@intel.com>2009-11-17 12:05:56 -0500
committerIngo Molnar <mingo@elte.hu>2009-11-19 00:03:33 -0500
commit11ada26c78febe4662a8e848f3bff74e3200c920 (patch)
tree1d84b8094b5d553b6590e8eea8fd564682d5b2cf /tools/perf
parent751386507701010831d72c522171753d2cd903d2 (diff)
perf tools: Add ia64 support for tools/perf/
Compiler on ia64 rejects the "-m64" option. Add arch specific pieces to perf.h Signed-off-by: Tony Luck <tony.luck@intel.com> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Paul Mackerras <paulus@samba.org> LKML-Reference: <4b02d7f43514327a@agluck-desktop.sc.intel.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf')
-rw-r--r--tools/perf/Makefile8
-rw-r--r--tools/perf/perf.h6
2 files changed, 11 insertions, 3 deletions
diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index 5d1a8b0dff8f..3f0666af93de 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -166,10 +166,12 @@ ifdef NO_64BIT
166 MBITS := -m32 166 MBITS := -m32
167else 167else
168 # 168 #
169 # If we're on a 64-bit kernel, use -m64: 169 # If we're on a 64-bit kernel (except ia64), use -m64:
170 # 170 #
171 ifneq ($(patsubst %64,%,$(uname_M)),$(uname_M)) 171 ifneq ($(uname_M),ia64)
172 MBITS := -m64 172 ifneq ($(patsubst %64,%,$(uname_M)),$(uname_M))
173 MBITS := -m64
174 endif
173 endif 175 endif
174endif 176endif
175 177
diff --git a/tools/perf/perf.h b/tools/perf/perf.h
index 216bdb223f63..454d5d55f32d 100644
--- a/tools/perf/perf.h
+++ b/tools/perf/perf.h
@@ -53,6 +53,12 @@
53#define cpu_relax() asm volatile("" ::: "memory") 53#define cpu_relax() asm volatile("" ::: "memory")
54#endif 54#endif
55 55
56#ifdef __ia64__
57#include "../../arch/ia64/include/asm/unistd.h"
58#define rmb() asm volatile ("mf" ::: "memory")
59#define cpu_relax() asm volatile ("hint @pause" ::: "memory")
60#endif
61
56#include <time.h> 62#include <time.h>
57#include <unistd.h> 63#include <unistd.h>
58#include <sys/types.h> 64#include <sys/types.h>