From f77bfc66618fde9d32bf48fc1e9432d3655ba53d Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 18 May 2011 21:00:44 +0200
Subject: [PATCH] --- yaml --- r: 245523 b: refs/heads/master c:
 b313207286a78abac19f1dd2721292eae598b0f5 h: refs/heads/master i:   245521:
 d1d843265d4e3793b60236290ba419a12b85d353   245519:
 ea8f3b02a74a4e798e1fe5a8574ca6ccb829f353 v: v3

---
 [refs]                                              | 2 +-
 trunk/tools/perf/util/include/asm/alternative-asm.h | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 trunk/tools/perf/util/include/asm/alternative-asm.h

diff --git a/[refs] b/[refs]
index 6391cb26525b..c44d5f9d88b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 01ed58abec07633791f03684b937a7e22e00c9bb
+refs/heads/master: b313207286a78abac19f1dd2721292eae598b0f5
diff --git a/trunk/tools/perf/util/include/asm/alternative-asm.h b/trunk/tools/perf/util/include/asm/alternative-asm.h
new file mode 100644
index 000000000000..6789d788d494
--- /dev/null
+++ b/trunk/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