diff options
| author | David S. Miller <davem@davemloft.net> | 2012-05-11 20:33:22 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-05-11 20:33:22 -0700 |
| commit | 8695c37d06721c581385725eb80ba4e6d6bdf73f (patch) | |
| tree | 072f37f58590aea8ca880b6175d127809edd4cec /arch/sparc/lib/strlen_user_64.S | |
| parent | b55e81b9f8cf0256bcfc548360aef642630c2919 (diff) | |
| download | blackbird-op-linux-8695c37d06721c581385725eb80ba4e6d6bdf73f.tar.gz blackbird-op-linux-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/strlen_user_64.S')
| -rw-r--r-- | arch/sparc/lib/strlen_user_64.S | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/sparc/lib/strlen_user_64.S b/arch/sparc/lib/strlen_user_64.S index 114ed111e251..c3df71fa4928 100644 --- a/arch/sparc/lib/strlen_user_64.S +++ b/arch/sparc/lib/strlen_user_64.S @@ -8,16 +8,16 @@ * Copyright (C) 1996,1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz) */ +#include <linux/linkage.h> #include <asm/asi.h> #define LO_MAGIC 0x01010101 #define HI_MAGIC 0x80808080 .align 4 - .global __strlen_user, __strnlen_user -__strlen_user: +ENTRY(__strlen_user) sethi %hi(32768), %o1 -__strnlen_user: +ENTRY(__strnlen_user) mov %o1, %g1 mov %o0, %o1 andcc %o0, 3, %g0 @@ -78,6 +78,8 @@ __strnlen_user: mov 2, %o0 23: retl mov 3, %o0 +ENDPROC(__strlen_user) +ENDPROC(__strnlen_user) .section .fixup,#alloc,#execinstr .align 4 |
