summaryrefslogtreecommitdiffstats
path: root/arch/sparc/lib
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1997-06-03 09:23:20 +0000
committerRalf Baechle <ralf@linux-mips.org>1997-06-03 09:23:20 +0000
commitac5ff8f4a72f7b4e66f73c3c6cb9fe7758cf6f12 (patch)
tree9fc7f8ce32e0d9a4aa055b2a58a05a5d727b333c /arch/sparc/lib
parent52662ff3e66770fd7e4fc508c91056d29c08bff0 (diff)
Sync with Linux 2.1.42.
Diffstat (limited to 'arch/sparc/lib')
-rw-r--r--arch/sparc/lib/blockops.S17
1 files changed, 8 insertions, 9 deletions
diff --git a/arch/sparc/lib/blockops.S b/arch/sparc/lib/blockops.S
index c11ab1b20..a5a4bffad 100644
--- a/arch/sparc/lib/blockops.S
+++ b/arch/sparc/lib/blockops.S
@@ -1,4 +1,4 @@
-/* $Id: blockops.S,v 1.6 1997/05/03 02:01:54 davem Exp $
+/* $Id: blockops.S,v 1.7 1997/05/20 07:58:28 jj Exp $
* blockops.S: Common block zero optimized routines.
*
* Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)
@@ -45,8 +45,11 @@
.text
.align 4
+ .globl C_LABEL(bzero_1page), C_LABEL(__copy_1page)
-generic_bzero_1page:
+C_LABEL(bzero_1page):
+/* NOTE: If you change the number of insns of this routine, please check
+ * arch/sparc/mm/hypersparc.S */
/* %o0 = buf */
or %g0, %g0, %g1
or %o0, %g0, %o1
@@ -63,7 +66,9 @@ generic_bzero_1page:
retl
nop
-__generic_copy_1page:
+C_LABEL(__copy_1page):
+/* NOTE: If you change the number of insns of this routine, please check
+ * arch/sparc/mm/hypersparc.S */
/* %o0 = dst, %o1 = src */
or %g0, 0x10, %g1
1:
@@ -82,9 +87,3 @@ __generic_copy_1page:
retl
nop
-
- .data
- .align 4
- .globl C_LABEL(bzero_1page), C_LABEL(__copy_1page)
-C_LABEL(bzero_1page): .word generic_bzero_1page
-C_LABEL(__copy_1page): .word __generic_copy_1page