diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-12-06 01:16:03 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-12-06 01:16:03 +0000 |
| commit | a8ad2213d5450882c147b32a24835db45ee09197 (patch) | |
| tree | d1a2a98e92d39ded1c4439a6d154583186b8325e /arch/mips | |
| parent | 8808c5c9a6d7c403182df664bf691a2408ad56ba (diff) | |
Fix memmove with zero len bug.
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/lib/Makefile | 1 | ||||
| -rw-r--r-- | arch/mips/lib/memcpy.S | 3 | ||||
| -rw-r--r-- | arch/mips/lib/memset.S | 4 |
3 files changed, 1 insertions, 7 deletions
diff --git a/arch/mips/lib/Makefile b/arch/mips/lib/Makefile index 844c83cbe..52331d233 100644 --- a/arch/mips/lib/Makefile +++ b/arch/mips/lib/Makefile @@ -1,4 +1,3 @@ -# $Id: Makefile,v 1.11 1999/10/17 19:55:22 harald Exp $ # # Makefile for MIPS-specific library files.. # diff --git a/arch/mips/lib/memcpy.S b/arch/mips/lib/memcpy.S index 4850b09ce..a7f1e43c8 100644 --- a/arch/mips/lib/memcpy.S +++ b/arch/mips/lib/memcpy.S @@ -3,8 +3,6 @@ * License. See the file "COPYING" in the main directory of this archive * for more details. * - * $Id: memcpy.S,v 1.3 1998/07/10 01:14:49 ralf Exp $ - * * Unified implementation of memcpy, memmove and the __copy_user backend. * For __rmemcpy and memmove an exception is always a kernel bug, therefore * they're not protected. In order to keep the exception fixup routine @@ -410,6 +408,7 @@ LEAF(memmove) sltu t0, v0, a1 # dst + len < src -> non- bnez t0, __memcpy # overlapping, can use memcpy move v0, a0 /* return value */ + beqz a2, r_out END(memmove) LEAF(__rmemcpy) /* a0=dst a1=src a2=len */ diff --git a/arch/mips/lib/memset.S b/arch/mips/lib/memset.S index 32f175756..0340cc2a1 100644 --- a/arch/mips/lib/memset.S +++ b/arch/mips/lib/memset.S @@ -1,13 +1,9 @@ /* - * include/asm-mips/types.h - * * This file is subject to the terms and conditions of the GNU General Public * License. See the file "COPYING" in the main directory of this archive * for more details. * * Copyright (C) 1998 by Ralf Baechle - * - * $Id: memset.S,v 1.2 1998/04/25 17:01:45 ralf Exp $ */ #include <asm/asm.h> #include <asm/offset.h> |