[Linux-mips-commits]CVS: linux/arch/mips/mm c-r5432.c,1.2,1.3 fault.c,1.6,1.7

[Bradley D. L. <br...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/mm
In directory usw-pr-cvs1:/tmp/cvs-serv14566/arch/mips/mm

Modified Files:
	c-r5432.c fault.c 
Log Message:
Trivial sync w/oss.


Index: c-r5432.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/mm/c-r5432.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- c-r5432.c	2001/10/31 18:26:52	1.2
+++ c-r5432.c	2001/11/04 15:57:38	1.3
@@ -42,7 +42,7 @@
 /* -------------------------------------------------------------------- */
 /* #include <asm/r4kcache.h> */
 
-static inline void flush_icache_line_indexed(unsigned long addr)
+extern inline void flush_icache_line_indexed(unsigned long addr)
 {
 	__asm__ __volatile__(
 		".set noreorder\n\t"
@@ -56,7 +56,7 @@
 		  "i" (Index_Invalidate_I));
 }
 
-static inline void flush_dcache_line_indexed(unsigned long addr)
+extern inline void flush_dcache_line_indexed(unsigned long addr)
 {
 	__asm__ __volatile__(
 		".set noreorder\n\t"
@@ -70,7 +70,7 @@
 		  "i" (Index_Writeback_Inv_D));
 }
 
-static inline void flush_icache_line(unsigned long addr)
+extern inline void flush_icache_line(unsigned long addr)
 {
 	__asm__ __volatile__(
 		".set noreorder\n\t"
@@ -83,7 +83,7 @@
 		  "i" (Hit_Invalidate_I));
 }
 
-static inline void flush_dcache_line(unsigned long addr)
+extern inline void flush_dcache_line(unsigned long addr)
 {
 	__asm__ __volatile__(
 		".set noreorder\n\t"
@@ -96,7 +96,7 @@
 		  "i" (Hit_Writeback_Inv_D));
 }
 
-static inline void invalidate_dcache_line(unsigned long addr)
+extern inline void invalidate_dcache_line(unsigned long addr)
 {
 	__asm__ __volatile__(
 		".set noreorder\n\t"
@@ -113,7 +113,7 @@
 /*
  * The next two are for badland addresses like signal trampolines.
  */
-static inline void protected_flush_icache_line(unsigned long addr)
+extern inline void protected_flush_icache_line(unsigned long addr)
 {
 	__asm__ __volatile__(
 		".set noreorder\n\t"
@@ -129,7 +129,7 @@
 		  "i" (Hit_Invalidate_I));
 }
 
-static inline void protected_writeback_dcache_line(unsigned long addr)
+extern inline void protected_writeback_dcache_line(unsigned long addr)
 {
 	__asm__ __volatile__(
 		".set noreorder\n\t"
@@ -172,7 +172,7 @@
 		: "r" (base),					\
 		  "i" (op));
 
-static inline void blast_dcache32(void)
+extern inline void blast_dcache32(void)
 {
 	unsigned long start = KSEG0;
 	unsigned long end = (start + dcache_size/2);
@@ -184,7 +184,7 @@
 	}
 }
 
-static inline void blast_dcache32_page(unsigned long page)
+extern inline void blast_dcache32_page(unsigned long page)
 {
 	unsigned long start = page;
 	unsigned long end = (start + PAGE_SIZE);
@@ -195,7 +195,7 @@
 	}
 }
 
-static inline void blast_dcache32_page_indexed(unsigned long page)
+extern inline void blast_dcache32_page_indexed(unsigned long page)
 {
 	unsigned long start = page;
 	unsigned long end = (start + PAGE_SIZE);
@@ -207,7 +207,7 @@
 	}
 }
 
-static inline void blast_icache32(void)
+extern inline void blast_icache32(void)
 {
 	unsigned long start = KSEG0;
 	unsigned long end = (start + icache_size/2);
@@ -219,7 +219,7 @@
 	}
 }
 
-static inline void blast_icache32_page(unsigned long page)
+extern inline void blast_icache32_page(unsigned long page)
 {
 	unsigned long start = page;
 	unsigned long end = (start + PAGE_SIZE);
@@ -230,7 +230,7 @@
 	}
 }
 
-static inline void blast_icache32_page_indexed(unsigned long page)
+extern inline void blast_icache32_page_indexed(unsigned long page)
 {
 	unsigned long start = page;
 	unsigned long end = (start + PAGE_SIZE);

Index: fault.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/mm/fault.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- fault.c	2001/10/31 19:13:03	1.6
+++ fault.c	2001/11/04 15:57:38	1.7
@@ -202,7 +202,7 @@
 	       "address %08lx, epc == %08lx, ra == %08lx\n",
 	       address, regs->cp0_epc, regs->regs[31]);
 	die("Oops", regs);
-	bust_spinlocks(0);
+	bust_spinlock(0);
 	do_exit(SIGKILL);
 
 /*