aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuck, Tony <tony.luck@intel.com>2009-11-17 09:05:56 -0800
committerIngo Molnar <mingo@elte.hu>2009-11-19 06:03:33 +0100
commit11ada26c78febe4662a8e848f3bff74e3200c920 (patch)
tree1d84b8094b5d553b6590e8eea8fd564682d5b2cf
parent751386507701010831d72c522171753d2cd903d2 (diff)
downloadkernel_samsung_aries-11ada26c78febe4662a8e848f3bff74e3200c920.zip
kernel_samsung_aries-11ada26c78febe4662a8e848f3bff74e3200c920.tar.gz
kernel_samsung_aries-11ada26c78febe4662a8e848f3bff74e3200c920.tar.bz2
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>
-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 5d1a8b0..3f0666a 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -166,10 +166,12 @@ ifdef NO_64BIT
MBITS := -m32
else
#
- # If we're on a 64-bit kernel, use -m64:
+ # If we're on a 64-bit kernel (except ia64), use -m64:
#
- ifneq ($(patsubst %64,%,$(uname_M)),$(uname_M))
- MBITS := -m64
+ ifneq ($(uname_M),ia64)
+ ifneq ($(patsubst %64,%,$(uname_M)),$(uname_M))
+ MBITS := -m64
+ endif
endif
endif
diff --git a/tools/perf/perf.h b/tools/perf/perf.h
index 216bdb2..454d5d5 100644
--- a/tools/perf/perf.h
+++ b/tools/perf/perf.h
@@ -53,6 +53,12 @@
#define cpu_relax() asm volatile("" ::: "memory")
#endif
+#ifdef __ia64__
+#include "../../arch/ia64/include/asm/unistd.h"
+#define rmb() asm volatile ("mf" ::: "memory")
+#define cpu_relax() asm volatile ("hint @pause" ::: "memory")
+#endif
+
#include <time.h>
#include <unistd.h>
#include <sys/types.h>