o Exported en/disable_irq

o fixed missing pseudo instruction in r6000_fpu.S
o Bugfixes for string.h

3 files changed, 19 insertions, 15 deletions

diff --git a/arch/mips/kernel/mips_ksyms.c b/arch/mips/kernel/mips_ksyms.c
index 1e9f878e8..612170b20 100644
--- a/arch/mips/kernel/mips_ksyms.c
+++ b/arch/mips/kernel/mips_ksyms.c
@@ -1,4 +1,4 @@
-/* $Id: mips_ksyms.c,v 1.17 1999/04/01 23:35:16 ulfc Exp $
+/* $Id: mips_ksyms.c,v 1.18 1999/04/05 01:30:49 ulfc Exp $
  *
  * Export MIPS-specific functions needed for loadable modules.
  *
@@ -13,6 +13,7 @@
 #include <linux/string.h>
 #include <linux/mm.h>
 #include <linux/interrupt.h>
+#include <asm/irq.h>
 #include <linux/in6.h>
 #include <linux/pci.h>
 
@@ -56,8 +57,8 @@ EXPORT_SYMBOL(clear_page);
 EXPORT_SYMBOL(__mips_bh_counter);
 EXPORT_SYMBOL(local_bh_count);
 EXPORT_SYMBOL(local_irq_count);
-//EXPORT_SYMBOL(enable_irq);
-//EXPORT_SYMBOL(disable_irq);
+EXPORT_SYMBOL(enable_irq);
+EXPORT_SYMBOL(disable_irq);
 EXPORT_SYMBOL(kernel_thread);
 
 /*
diff --git a/arch/mips/kernel/r6000_fpu.S b/arch/mips/kernel/r6000_fpu.S
index db471fa96..523733420 100644
--- a/arch/mips/kernel/r6000_fpu.S
+++ b/arch/mips/kernel/r6000_fpu.S
@@ -10,7 +10,7 @@
  * Multi-arch abstraction and asm macros for easier reading:
  * Copyright (C) 1996 David S. Miller (dm@engr.sgi.com)
  *
- * $Id: r6000_fpu.S,v 1.3 1997/12/01 16:56:56 ralf Exp $
+ * $Id: r6000_fpu.S,v 1.3 1997/12/01 17:57:30 ralf Exp $
  */
 #include <asm/asm.h>
 #include <asm/fpregdef.h>
@@ -19,6 +19,7 @@
 #include <asm/regdef.h>
 
 	.set	noreorder
+	.set	mips2
 	/* Save floating point context */
 	LEAF(r6000_save_fp_context)
 	mfc0	t0,CP0_STATUS
diff --git a/include/asm-mips/string.h b/include/asm-mips/string.h
index 989ebd73e..2ca7e93e8 100644
--- a/include/asm-mips/string.h
+++ b/include/asm-mips/string.h
@@ -1,4 +1,4 @@
-/* $Id: string.h,v 1.6 1998/07/20 17:52:21 ralf Exp $
+/* $Id: string.h,v 1.9 1998/08/25 09:22:02 ralf Exp $
  *
  * 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
@@ -96,16 +96,16 @@ extern __inline__ int strncmp(__const__ char *__cs, __const__ char *__ct, size_t
   __asm__ __volatile__(
 	".set\tnoreorder\n\t"
 	".set\tnoat\n"
-	"1:\tlbu\t%3,(%0)\n\t"
+	"1:\tlbu\t%3,(%1)\n\t"
 	"beqz\t%2,2f\n\t"
-	"lbu\t$1,(%1)\n\t"
-	"subu\t%2,1\n\t"
-	"bne\t$1,%3,3f\n\t"
+	"lbu\t$1,(%0)\n\t"
+	"addiu\t%1,1\n\t"
+	"subu\t%3,$1,%3\n\t"
+	"bnez\t%3,2f\n\t"
 	"addiu\t%0,1\n\t"
-	"bnez\t%3,1b\n\t"
-	"addiu\t%1,1\n"
-	"2:\tmove\t%3,$1\n"
-	"3:\tsubu\t%3,$1\n\t"
+	"bnez\t%1,1b\n"
+	"addiu\t%2,-1\n"
+	"2:\n\t"
 	".set\tat\n\t"
 	".set\treorder"
 	: "=r" (__cs), "=r" (__ct), "=r" (__count), "=r" (__res)
@@ -132,12 +132,14 @@ extern __inline__ void *memscan(void *__addr, int __c, size_t __size)
 {
 	char *__end = (char *)__addr + __size;
 
-	__asm__(".set\tnoat\n"
+	__asm__(".set\tpush\n\t"
+		".set\tnoat\n\t"
+		".set\treorder\n\t"
 		"1:\tbeq\t%0,%1,2f\n\t"
 		"addiu\t%0,1\n\t"
 		"lb\t$1,-1(%0)\n\t"
 		"bne\t$1,%4,1b\n"
-		"2:\t.set\tat"
+		"2:\t.set\tpop"
 		: "=r" (__addr), "=r" (__end)
 		: "0" (__addr), "1" (__end), "r" (__c)
 		: "$1");