From: Andreas Schwab <schwab@suse.de>
Date: Wed, 27 Apr 2005 06:00:00 +0000 (-0700)
Subject: [IA64] Fix memcpy_mck.S for current binutils
X-Git-Tag: v2.6.12-rc4~117^2~5^2~31
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=512f64295f2f0049515dcc4e97c1f1ae0df9629c;p=linux-2.6-omap-h63xx.git

[IA64] Fix memcpy_mck.S for current binutils

The current ia64 assembler complains about mismatching .proc/.endp pairs.
(Same patch also sent by H.J. Lu)

Signed-off-by: Andreas Schwab <schwab@suse.de>
Signed-off-by: Tony Luck <tony.luck@intel.com>
---

diff --git a/arch/ia64/lib/memcpy_mck.S b/arch/ia64/lib/memcpy_mck.S
index 3c2cd2f04db..6f308e62c13 100644
--- a/arch/ia64/lib/memcpy_mck.S
+++ b/arch/ia64/lib/memcpy_mck.S
@@ -75,6 +75,7 @@ GLOBAL_ENTRY(memcpy)
 	mov	f6=f0
 	br.cond.sptk .common_code
 	;;
+END(memcpy)
 GLOBAL_ENTRY(__copy_user)
 	.prologue
 // check dest alignment
@@ -524,7 +525,6 @@ EK(.ex_handler,  (p17)	st8	[dst1]=r39,8);						\
 #undef B
 #undef C
 #undef D
-END(memcpy)
 
 /*
  * Due to lack of local tag support in gcc 2.x assembler, it is not clear which