diff options
author | Ralf Baechle <ralf@linux-mips.org> | 1998-08-25 09:12:35 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 1998-08-25 09:12:35 +0000 |
commit | c7fc24dc4420057f103afe8fc64524ebc25c5d37 (patch) | |
tree | 3682407a599b8f9f03fc096298134cafba1c9b2f /include/asm-sparc64/string.h | |
parent | 1d793fade8b063fde3cf275bf1a5c2d381292cd9 (diff) |
o Merge with Linux 2.1.116.
o New Newport console code.
o New G364 console code.
Diffstat (limited to 'include/asm-sparc64/string.h')
-rw-r--r-- | include/asm-sparc64/string.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-sparc64/string.h b/include/asm-sparc64/string.h index 545e1285d..b5293acd9 100644 --- a/include/asm-sparc64/string.h +++ b/include/asm-sparc64/string.h @@ -1,4 +1,4 @@ -/* $Id: string.h,v 1.8 1997/11/19 07:57:50 jj Exp $ +/* $Id: string.h,v 1.11 1998/06/12 14:54:35 jj Exp $ * string.h: External definitions for optimized assembly string * routines for the Linux Kernel. * @@ -67,8 +67,8 @@ extern inline void *__nonconstant_memcpy(void *to, const void *from, __kernel_si extern inline void *__constant_c_and_count_memset(void *s, char c, __kernel_size_t count) { - extern void *__bzero_1page(void *); extern __kernel_size_t __bzero(void *, __kernel_size_t); + extern void *__bzero_1page(void *); if(!c) { if (count == 8192) |