[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-11ada26c78febe4662a8e848f3bff74e3200c920@git.kernel.org>
Date: Thu, 19 Nov 2009 05:30:49 GMT
From: "tip-bot for Luck, Tony" <tony.luck@...el.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, paulus@...ba.org, hpa@...or.com,
mingo@...hat.com, a.p.zijlstra@...llo.nl, tony.luck@...el.com,
tglx@...utronix.de, mingo@...e.hu
Subject: [tip:perf/core] perf tools: Add ia64 support for tools/perf/
Commit-ID: 11ada26c78febe4662a8e848f3bff74e3200c920
Gitweb: http://git.kernel.org/tip/11ada26c78febe4662a8e848f3bff74e3200c920
Author: Luck, Tony <tony.luck@...el.com>
AuthorDate: Tue, 17 Nov 2009 09:05:56 -0800
Committer: Ingo Molnar <mingo@...e.hu>
CommitDate: Thu, 19 Nov 2009 06:03:33 +0100
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@...el.com>
Cc: Peter Zijlstra <a.p.zijlstra@...llo.nl>
Cc: Paul Mackerras <paulus@...ba.org>
LKML-Reference: <4b02d7f43514327a@...uck-desktop.sc.intel.com>
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
tools/perf/Makefile | 8 +++++---
tools/perf/perf.h | 6 ++++++
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>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists