From 8b2bff62984a918469627edda349f15a66ce01a8 Mon Sep 17 00:00:00 2001
From: "Luck, Tony" <tony.luck@intel.com>
Date: Tue, 17 Nov 2009 09:05:56 -0800
Subject: [PATCH] --- yaml --- r: 169642 b: refs/heads/master c:
 11ada26c78febe4662a8e848f3bff74e3200c920 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/tools/perf/Makefile | 8 +++++---
 trunk/tools/perf/perf.h   | 6 ++++++
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 5b8948f94b08..f8ca5a2cea8e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 751386507701010831d72c522171753d2cd903d2
+refs/heads/master: 11ada26c78febe4662a8e848f3bff74e3200c920
diff --git a/trunk/tools/perf/Makefile b/trunk/tools/perf/Makefile
index 5d1a8b0dff8f..3f0666af93de 100644
--- a/trunk/tools/perf/Makefile
+++ b/trunk/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/trunk/tools/perf/perf.h b/trunk/tools/perf/perf.h
index 216bdb223f63..454d5d55f32d 100644
--- a/trunk/tools/perf/perf.h
+++ b/trunk/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>