Messages in this thread Patch in this message | | | Date | Tue, 17 Nov 2009 17:18:51 GMT | From | "tip-bot for Luck, Tony" <> | Subject | [tip:perf/core] perf tools: Add ia64 support for tools/perf/ |
| |
Commit-ID: 5960a8b22f5015d6e36b2a095c47bc27e8e685c8 Gitweb: http://git.kernel.org/tip/5960a8b22f5015d6e36b2a095c47bc27e8e685c8 Author: Luck, Tony <tony.luck@intel.com> AuthorDate: Tue, 17 Nov 2009 09:05:56 -0800 Committer: Ingo Molnar <mingo@elte.hu> CommitDate: Tue, 17 Nov 2009 18:14:24 +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@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> --- 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 b356987..53e663a 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>
| |