[tip:perf/core] perf bench, x86: Add alternatives-asm.h wrapper

From: tip-bot for Ingo Molnar
Date: Wed May 18 2011 - 16:45:22 EST


Commit-ID: b313207286a78abac19f1dd2721292eae598b0f5
Gitweb: http://git.kernel.org/tip/b313207286a78abac19f1dd2721292eae598b0f5
Author: Ingo Molnar <mingo@xxxxxxx>
AuthorDate: Wed, 18 May 2011 21:00:44 +0200
Committer: Ingo Molnar <mingo@xxxxxxx>
CommitDate: Wed, 18 May 2011 21:00:44 +0200

perf bench, x86: Add alternatives-asm.h wrapper

perf bench needs this to build the kernel's memcpy routine:

In file included from bench/mem-memcpy-x86-64-asm.S:2:0:
bench/../../../arch/x86/lib/memcpy_64.S:7:33: fatal error: asm/alternative-asm.h: No such file or directory

Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
Cc: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Mike Galbraith <efault@xxxxxx>
Cc: Steven Rostedt <rostedt@xxxxxxxxxxx>
Link: http://lkml.kernel.org/n/tip-c5d41xibgullk8h2280q4gv0@xxxxxxxxxxxxxx
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
tools/perf/util/include/asm/alternative-asm.h | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/tools/perf/util/include/asm/alternative-asm.h b/tools/perf/util/include/asm/alternative-asm.h
new file mode 100644
index 0000000..6789d78
--- /dev/null
+++ b/tools/perf/util/include/asm/alternative-asm.h
@@ -0,0 +1,8 @@
+#ifndef _PERF_ASM_ALTERNATIVE_ASM_H
+#define _PERF_ASM_ALTERNATIVE_ASM_H
+
+/* Just disable it so we can build arch/x86/lib/memcpy_64.S for perf bench: */
+
+#define altinstruction_entry #
+
+#endif
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/