sparc: Convert some assembler over to linakge.h's ENTRY/ENDPROC

Use those, instead of doing it all by hand.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 8 insertions, 12 deletions

diff --git a/arch/sparc/lib/bzero.S b/arch/sparc/lib/bzero.S
index 615f401edf69..8c058114b649 100644
--- a/arch/sparc/lib/bzero.S
+++ b/arch/sparc/lib/bzero.S
@@ -4,11 +4,11 @@
  * Copyright (C) 2005 David S. Miller <davem@davemloft.net>
  */
 
+#include <linux/linkage.h>
+
         .text
 
-        .globl  memset
-        .type   memset, #function
-memset:                 /* %o0=buf, %o1=pat, %o2=len */
+ENTRY(memset) /* %o0=buf, %o1=pat, %o2=len */
         and             %o1, 0xff, %o3
         mov             %o2, %o1
         sllx            %o3, 8, %g1
@@ -19,9 +19,7 @@ memset:			/* %o0=buf, %o1=pat, %o2=len */
         ba,pt           %xcc, 1f
          or             %g1, %o2, %o2
 
-        .globl  __bzero
-        .type   __bzero, #function
-__bzero:                /* %o0=buf, %o1=len */
+ENTRY(__bzero) /* %o0=buf, %o1=len */
         clr             %o2
 1:      mov             %o0, %o3
         brz,pn          %o1, __bzero_done
@@ -78,8 +76,8 @@ __bzero_tiny:
 __bzero_done:
         retl
          mov            %o3, %o0
-        .size           __bzero, .-__bzero
-        .size           memset, .-memset
+ENDPROC(__bzero)
+ENDPROC(memset)
 
 #define EX_ST(x,y)              \
 98:     x,y;                    \
@@ -89,9 +87,7 @@ __bzero_done:
         .text;                  \
         .align 4;
 
-        .globl  __clear_user
-        .type   __clear_user, #function
-__clear_user:           /* %o0=buf, %o1=len */
+ENTRY(__clear_user) /* %o0=buf, %o1=len */
         brz,pn          %o1, __clear_user_done
          cmp            %o1, 16
         bl,pn           %icc, __clear_user_tiny
@@ -146,4 +142,4 @@ __clear_user_tiny:
 __clear_user_done:
         retl
          clr            %o0
-        .size           __clear_user, .-__clear_user
+ENDPROC(__clear_user)