summaryrefslogtreecommitdiff
path: root/arch/sparc/lib/strncpy_from_user_32.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/strncpy_from_user_32.S
parentb55e81b9f8cf0256bcfc548360aef642630c2919 (diff)
downloadlinux-8695c37d06721c581385725eb80ba4e6d6bdf73f.tar.gz
linux-8695c37d06721c581385725eb80ba4e6d6bdf73f.tar.bz2
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/strncpy_from_user_32.S')
-rw-r--r--arch/sparc/lib/strncpy_from_user_32.S6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/sparc/lib/strncpy_from_user_32.S b/arch/sparc/lib/strncpy_from_user_32.S
index d77198976a66..db0ed2964bdb 100644
--- a/arch/sparc/lib/strncpy_from_user_32.S
+++ b/arch/sparc/lib/strncpy_from_user_32.S
@@ -3,11 +3,11 @@
* Copyright(C) 1996 David S. Miller
*/
+#include <linux/linkage.h>
#include <asm/ptrace.h>
#include <asm/errno.h>
.text
- .align 4
/* Must return:
*
@@ -16,8 +16,7 @@
* bytes copied if we hit a null byte
*/
- .globl __strncpy_from_user
-__strncpy_from_user:
+ENTRY(__strncpy_from_user)
/* %o0=dest, %o1=src, %o2=count */
mov %o2, %o3
1:
@@ -35,6 +34,7 @@ __strncpy_from_user:
add %o2, 1, %o0
retl
sub %o3, %o0, %o0
+ENDPROC(__strncpy_from_user)
.section .fixup,#alloc,#execinstr
.align 4