1 files changed, 13 insertions, 24 deletions

diff --git a/arch/sparc/lib/bitops.S b/arch/sparc/lib/bitops.S
index 3dc61d5537c0..36f72cc0e67e 100644
--- a/arch/sparc/lib/bitops.S
+++ b/arch/sparc/lib/bitops.S
@@ -3,14 +3,13 @@
  * Copyright (C) 2000, 2007 David S. Miller (davem@davemloft.net)
  */
 
+#include <linux/linkage.h>
 #include <asm/asi.h>
 #include <asm/backoff.h>
 
         .text
 
-        .globl  test_and_set_bit
-        .type   test_and_set_bit,#function
-test_and_set_bit:       /* %o0=nr, %o1=addr */
+ENTRY(test_and_set_bit) /* %o0=nr, %o1=addr */
         BACKOFF_SETUP(%o3)
         srlx    %o0, 6, %g1
         mov     1, %o2
@@ -29,11 +28,9 @@ test_and_set_bit:	/* %o0=nr, %o1=addr */
         retl
          nop
 2:      BACKOFF_SPIN(%o3, %o4, 1b)
-        .size   test_and_set_bit, .-test_and_set_bit
+ENDPROC(test_and_set_bit)
 
-        .globl  test_and_clear_bit
-        .type   test_and_clear_bit,#function
-test_and_clear_bit:     /* %o0=nr, %o1=addr */
+ENTRY(test_and_clear_bit) /* %o0=nr, %o1=addr */
         BACKOFF_SETUP(%o3)
         srlx    %o0, 6, %g1
         mov     1, %o2
@@ -52,11 +49,9 @@ test_and_clear_bit:	/* %o0=nr, %o1=addr */
         retl
          nop
 2:      BACKOFF_SPIN(%o3, %o4, 1b)
-        .size   test_and_clear_bit, .-test_and_clear_bit
+ENDPROC(test_and_clear_bit)
 
-        .globl  test_and_change_bit
-        .type   test_and_change_bit,#function
-test_and_change_bit:    /* %o0=nr, %o1=addr */
+ENTRY(test_and_change_bit) /* %o0=nr, %o1=addr */
         BACKOFF_SETUP(%o3)
         srlx    %o0, 6, %g1
         mov     1, %o2
@@ -75,11 +70,9 @@ test_and_change_bit:	/* %o0=nr, %o1=addr */
         retl
          nop
 2:      BACKOFF_SPIN(%o3, %o4, 1b)
-        .size   test_and_change_bit, .-test_and_change_bit
+ENDPROC(test_and_change_bit)
 
-        .globl  set_bit
-        .type   set_bit,#function
-set_bit:                /* %o0=nr, %o1=addr */
+ENTRY(set_bit) /* %o0=nr, %o1=addr */
         BACKOFF_SETUP(%o3)
         srlx    %o0, 6, %g1
         mov     1, %o2
@@ -96,11 +89,9 @@ set_bit:		/* %o0=nr, %o1=addr */
         retl
          nop
 2:      BACKOFF_SPIN(%o3, %o4, 1b)
-        .size   set_bit, .-set_bit
+ENDPROC(set_bit)
 
-        .globl  clear_bit
-        .type   clear_bit,#function
-clear_bit:              /* %o0=nr, %o1=addr */
+ENTRY(clear_bit) /* %o0=nr, %o1=addr */
         BACKOFF_SETUP(%o3)
         srlx    %o0, 6, %g1
         mov     1, %o2
@@ -117,11 +108,9 @@ clear_bit:		/* %o0=nr, %o1=addr */
         retl
          nop
 2:      BACKOFF_SPIN(%o3, %o4, 1b)
-        .size   clear_bit, .-clear_bit
+ENDPROC(clear_bit)
 
-        .globl  change_bit
-        .type   change_bit,#function
-change_bit:             /* %o0=nr, %o1=addr */
+ENTRY(change_bit) /* %o0=nr, %o1=addr */
         BACKOFF_SETUP(%o3)
         srlx    %o0, 6, %g1
         mov     1, %o2
@@ -138,4 +127,4 @@ change_bit:		/* %o0=nr, %o1=addr */
         retl
          nop
 2:      BACKOFF_SPIN(%o3, %o4, 1b)
-        .size   change_bit, .-change_bit
+ENDPROC(change_bit)