aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc/lib/blockops.S
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-05-11 20:33:22 -0700
committerDavid S. Miller <davem@davemloft.net>2012-05-11 20:33:22 -0700
commit8695c37d06721c581385725eb80ba4e6d6bdf73f (patch)
tree072f37f58590aea8ca880b6175d127809edd4cec /arch/sparc/lib/blockops.S
parentsparc32: Remove inline strncmp "optimization" for constant counts. (diff)
downloadlinux-dev-8695c37d06721c581385725eb80ba4e6d6bdf73f.tar.xz
linux-dev-8695c37d06721c581385725eb80ba4e6d6bdf73f.zip
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>
Diffstat (limited to 'arch/sparc/lib/blockops.S')
-rw-r--r--arch/sparc/lib/blockops.S10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/sparc/lib/blockops.S b/arch/sparc/lib/blockops.S
index 804be87f9a42..3c771011ff4b 100644
--- a/arch/sparc/lib/blockops.S
+++ b/arch/sparc/lib/blockops.S
@@ -4,6 +4,7 @@
* Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)
*/
+#include <linux/linkage.h>
#include <asm/page.h>
/* Zero out 64 bytes of memory at (buf + offset).
@@ -44,10 +45,7 @@
*/
.text
- .align 4
- .globl bzero_1page, __copy_1page
-
-bzero_1page:
+ENTRY(bzero_1page)
/* NOTE: If you change the number of insns of this routine, please check
* arch/sparc/mm/hypersparc.S */
/* %o0 = buf */
@@ -65,8 +63,9 @@ bzero_1page:
retl
nop
+ENDPROC(bzero_1page)
-__copy_1page:
+ENTRY(__copy_1page)
/* NOTE: If you change the number of insns of this routine, please check
* arch/sparc/mm/hypersparc.S */
/* %o0 = dst, %o1 = src */
@@ -87,3 +86,4 @@ __copy_1page:
retl
nop
+ENDPROC(__copy_1page)