From e07dd35799803550db55ddb3e07e45a8cbc86288 Mon Sep 17 00:00:00 2001
From: Petr Vandrovec <petr@vandrovec.name>
Date: Sun, 12 Aug 2007 10:12:52 +0200
Subject: [PATCH] --- yaml --- r: 63932 b: refs/heads/master c:
 b8d3f2448b8f4ba24f301e23585547ba1acc1f04 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/arch/x86_64/lib/memcpy.S | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d1846a222e03..11b6c9fa7064 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3864e8ccbba1dcdea87398ab80fdc8ae0fab7c45
+refs/heads/master: b8d3f2448b8f4ba24f301e23585547ba1acc1f04
diff --git a/trunk/arch/x86_64/lib/memcpy.S b/trunk/arch/x86_64/lib/memcpy.S
index 0ea0ddc875a7..c22981fa2f3a 100644
--- a/trunk/arch/x86_64/lib/memcpy.S
+++ b/trunk/arch/x86_64/lib/memcpy.S
@@ -124,6 +124,8 @@ ENDPROC(__memcpy)
 	.quad memcpy
 	.quad 1b
 	.byte X86_FEATURE_REP_GOOD
-	.byte .Lfinal - memcpy
+	/* Replace only beginning, memcpy is used to apply alternatives, so it
+	 * is silly to overwrite itself with nops - reboot is only outcome... */
+	.byte 2b - 1b
 	.byte 2b - 1b
 	.previous