[LV-kern-commit] CVS: kernel-2.4/arch/mips/lib Makefile,1.1.1.1,1.2 csum_partial.S,1.1.1.1,1.2 csum_

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/linux-vax/kernel-2.4/arch/mips/lib
In directory usw-pr-cvs1:/tmp/cvs-serv16972/mips/lib

Modified Files:
	Makefile csum_partial.S csum_partial_copy.c floppy-no.c 
	floppy-std.c ide-no.c ide-std.c kbd-no.c kbd-std.c memcpy.S 
	memset.S rtc-no.c rtc-std.c strlen_user.S strncpy_user.S 
	strnlen_user.S watch.S 
Log Message:
synch 2.4.15


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/mips/lib/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

--- Makefile	14 Jan 2001 19:28:10 -0000	1.1.1.1
+++ Makefile	10 Apr 2002 14:38:06 -0000	1.2
@@ -9,26 +9,19 @@
 
 L_TARGET = lib.a
 
-L_OBJS	= csum_partial.o csum_partial_copy.o \
-          rtc-std.o rtc-no.o memcpy.o memset.o  watch.o\
-          strlen_user.o strncpy_user.o strnlen_user.o
+obj-y				+= csum_partial.o csum_partial_copy.o \
+				   rtc-std.o rtc-no.o memcpy.o memset.o \
+				   watch.o strlen_user.o strncpy_user.o \
+				   strnlen_user.o
 
 ifdef CONFIG_CPU_R3000
-  L_OBJS += r3k_dump_tlb.o 
+  obj-y	+= r3k_dump_tlb.o 
 else
-  L_OBJS += dump_tlb.o 
+  obj-y	+= dump_tlb.o 
 endif
 
-ifdef CONFIG_BLK_DEV_FD
-  L_OBJS += floppy-no.o floppy-std.o
-endif
-
-ifdef CONFIG_IDE
-  L_OBJS += ide-std.o ide-no.o
-endif
-
-ifdef CONFIG_PC_KEYB
-  L_OBJS += kbd-std.o kbd-no.o
-endif
+obj-$(CONFIG_BLK_DEV_FD)	+= floppy-no.o floppy-std.o
+obj-$(CONFIG_IDE)		+= ide-std.o ide-no.o
+obj-$(CONFIG_PC_KEYB)		+= kbd-std.o kbd-no.o
 
 include $(TOPDIR)/Rules.make

Index: csum_partial.S
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/mips/lib/csum_partial.S,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: csum_partial_copy.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/mips/lib/csum_partial_copy.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: floppy-no.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/mips/lib/floppy-no.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: floppy-std.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/mips/lib/floppy-std.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: ide-no.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/mips/lib/ide-no.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: ide-std.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/mips/lib/ide-std.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- ide-std.c	14 Jan 2001 19:28:13 -0000	1.1.1.1
+++ ide-std.c	10 Apr 2002 14:38:07 -0000	1.2
@@ -1,12 +1,11 @@
-/* $Id$
- *
+/*
  * 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.
  *
  * IDE routines for typical pc-like standard configurations.
  *
- * Copyright (C) 1998, 1999 by Ralf Baechle
+ * Copyright (C) 1998, 1999, 2001 by Ralf Baechle
  */
 #include <linux/sched.h>
 #include <linux/ide.h>
@@ -60,6 +59,7 @@
 	}
 	if (irq != NULL)
 		*irq = 0;
+	hw->io_ports[IDE_IRQ_OFFSET] = 0;
 }
 
 static int std_ide_request_irq(unsigned int irq,

Index: kbd-no.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/mips/lib/kbd-no.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: kbd-std.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/mips/lib/kbd-std.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- kbd-std.c	14 Jan 2001 19:28:16 -0000	1.1.1.1
+++ kbd-std.c	10 Apr 2002 14:38:07 -0000	1.2
@@ -19,7 +19,11 @@
 
 static void std_kbd_request_region(void)
 {
+#ifdef CONFIG_MIPS_ITE8172
+	request_region(0x14000060, 16, "keyboard");
+#else
 	request_region(0x60, 16, "keyboard");
+#endif
 }
 
 static int std_kbd_request_irq(void (*handler)(int, void *, struct pt_regs *))

Index: memcpy.S
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/mips/lib/memcpy.S,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- memcpy.S	14 Jan 2001 19:28:13 -0000	1.1.1.1
+++ memcpy.S	10 Apr 2002 14:38:07 -0000	1.2
@@ -402,16 +402,20 @@
 
 	.align	5
 LEAF(memmove)
-	sltu	t0, a0, a1			# dst < src -> memcpy
-	bnez	t0, memcpy
-	 addu	v0, a0, a2
-	sltu	t0, v0, a1			# dst + len < src -> non-
-	bnez	t0, __memcpy			# overlapping, can use memcpy
+	addu	t0, a0, a2
+	sltu	t0, a1, t0			# dst + len <= src -> memcpy
+	addu	t1, a1, a2
+	sltu	t1, a0, t1			# dst >= src + len -> memcpy
+	and	t0, t1
+	beqz	t0, __memcpy
 	 move	v0, a0				/* return value */
 	beqz	a2, r_out
 	END(memmove)
 
 LEAF(__rmemcpy)					/* a0=dst a1=src a2=len */
+	sltu	t0, a1, a0
+	beqz	t0, r_end_bytes_up		# src >= dst
+	 nop
 	addu	a0, a2				# dst = dst + len
 	addu	a1, a2				# src = src + len
 
@@ -563,6 +567,17 @@
 	 subu	a0, a0, 0x1
 
 r_out:
+	jr	ra
+	 move	a2, zero
+
+r_end_bytes_up:
+	lb	t0, (a1)
+	subu	a2, a2, 0x1
+	sb	t0, (a0)
+	addu	a1, a1, 0x1
+	bnez	a2, r_end_bytes_up
+	 addu	a0, a0, 0x1
+
 	jr	ra
 	 move	a2, zero
 

Index: memset.S
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/mips/lib/memset.S,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- memset.S	14 Jan 2001 19:28:16 -0000	1.1.1.1
+++ memset.S	10 Apr 2002 14:38:07 -0000	1.2
@@ -54,6 +54,7 @@
 1:
 
 EXPORT(__bzero)
+	.type   __bzero, @function
 	sltiu	t0, a2, 4			/* very small region? */
 	bnez	t0, small_memset
 	 andi	t0, a0, 3			/* aligned? */

Index: rtc-no.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/mips/lib/rtc-no.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- rtc-no.c	14 Jan 2001 19:28:16 -0000	1.1.1.1
+++ rtc-no.c	10 Apr 2002 14:38:07 -0000	1.2
@@ -1,5 +1,4 @@
-/* $Id$
- *
+/*
  * 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.
@@ -7,28 +6,25 @@
  * Stub RTC routines to keep Linux from crashing on machine which don't
  * have a RTC chip.
  *
- * Copyright (C) 1998 by Ralf Baechle
+ * Copyright (C) 1998, 2001 by Ralf Baechle
  */
 #include <linux/kernel.h>
 #include <linux/mc146818rtc.h>
 
-static unsigned char no_rtc_read_data(unsigned long addr)
+static unsigned int shouldnt_happen(void)
 {
-	panic("no_rtc_read_data called - shouldn't happen.");
-}
+	static int called;
 
-static void no_rtc_write_data(unsigned char data, unsigned long addr)
-{
-	panic("no_rtc_write_data called - shouldn't happen.");
-}
+	if (!called) {
+		called = 1;
+		printk(KERN_DEBUG "RTC functions called - shouldn't happen\n");
+	}
 
-static int no_rtc_bcd_mode(void)
-{
-	panic("no_rtc_bcd_mode called - shouldn't happen.");
+	return 0;
 }
 
 struct rtc_ops no_rtc_ops = {
-	&no_rtc_read_data,
-	&no_rtc_write_data,
-	&no_rtc_bcd_mode
+    rtc_read_data:  (void *) &shouldnt_happen,
+    rtc_write_data: (void *) &shouldnt_happen,
+    rtc_bcd_mode:   (void *) &shouldnt_happen
 };

Index: rtc-std.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/mips/lib/rtc-std.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- rtc-std.c	14 Jan 2001 19:28:16 -0000	1.1.1.1
+++ rtc-std.c	10 Apr 2002 14:38:07 -0000	1.2
@@ -1,12 +1,11 @@
-/* $Id$
- *
+/*
  * 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.
  *
  * RTC routines for PC style attached Dallas chip.
  *
- * Copyright (C) 1998 by Ralf Baechle
+ * Copyright (C) 1998, 2001 by Ralf Baechle
  */
 #include <linux/mc146818rtc.h>
 #include <asm/io.h>

Index: strlen_user.S
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/mips/lib/strlen_user.S,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: strncpy_user.S
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/mips/lib/strncpy_user.S,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: strnlen_user.S
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/mips/lib/strnlen_user.S,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2

Index: watch.S
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/arch/mips/lib/watch.S,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2



