patch-2.4.0-test2 linux/arch/ia64/lib/strncpy_from_user.S

Next file: linux/arch/ia64/lib/strnlen_user.S
Previous file: linux/arch/ia64/lib/strlen_user.S
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test1/linux/arch/ia64/lib/strncpy_from_user.S linux/arch/ia64/lib/strncpy_from_user.S
@@ -16,6 +16,8 @@
  *			 by Andreas Schwab <schwab@suse.de>).
  */
 
+#include <asm/asmmacro.h>
+
 #define EX(x...)				\
 99:	x;					\
 	.section __ex_table,"a";		\
@@ -28,10 +30,7 @@
 	.psr lsb
 	.lsb
 
-	.align 32
-	.global __strncpy_from_user
-	.proc __strncpy_from_user
-__strncpy_from_user:
+GLOBAL_ENTRY(__strncpy_from_user)
 	alloc r2=ar.pfs,3,0,0,0
 	mov r8=0
 	mov r9=in1
@@ -53,5 +52,4 @@
 
 .Lexit:
 	br.ret.sptk.few rp
-
-	.endp __strncpy_from_user
+END(__strncpy_from_user)

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)