Update of /cvsroot/linux-mips/linux/arch/mips64/mm
In directory usw-pr-cvs1:/tmp/cvs-serv29100/arch/mips64/mm
Modified Files:
c-sb1.c fault.c r4xx0.c tlb-sb1.c tlbex-r4k.S
Log Message:
Updated Mips 64 to OSS tree.
Index: c-sb1.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips64/mm/c-sb1.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- c-sb1.c 24 Apr 2002 17:30:19 -0000 1.6
+++ c-sb1.c 30 May 2002 20:42:11 -0000 1.7
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-
+#include <linux/config.h>
#include <linux/init.h>
#include <asm/mmu_context.h>
#include <asm/bootinfo.h>
@@ -203,7 +203,7 @@
".set pop \n"
:
: "r" (start & ~(icache_line_size - 1)),
- "r" ((end - 1) & ~(dcache_line_size - 1)),
+ "r" ((end - 1) & ~(icache_line_size - 1)),
"r" (icache_line_size),
"i" (Index_Invalidate_I));
}
Index: fault.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips64/mm/fault.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- fault.c 26 Feb 2002 17:34:15 -0000 1.11
+++ fault.c 30 May 2002 20:42:14 -0000 1.12
@@ -21,6 +21,7 @@
#include <linux/smp_lock.h>
#include <linux/version.h>
+#include <asm/branch.h>
#include <asm/hardirq.h>
#include <asm/pgalloc.h>
#include <asm/mmu_context.h>
@@ -208,7 +209,7 @@
no_context:
/* Are we prepared to handle this kernel fault? */
- fixup = search_exception_table(regs->cp0_epc);
+ fixup = search_exception_table(exception_epc(regs));
if (fixup) {
long new_epc;
Index: r4xx0.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips64/mm/r4xx0.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- r4xx0.c 28 May 2002 20:25:37 -0000 1.15
+++ r4xx0.c 30 May 2002 20:42:14 -0000 1.16
@@ -9,6 +9,7 @@
* Copyright (C) 1997, 1998, 1999, 2000, 2001 Ralf Baechle (ra...@gn...)
* Copyright (C) 1999, 2000 Silicon Graphics, Inc.
*/
+#include <linux/config.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/sched.h>
Index: tlb-sb1.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips64/mm/tlb-sb1.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- tlb-sb1.c 19 Feb 2002 17:29:13 -0000 1.2
+++ tlb-sb1.c 30 May 2002 20:42:15 -0000 1.3
@@ -17,6 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <linux/config.h>
#include <asm/mmu_context.h>
#include <asm/bootinfo.h>
#include <asm/cpu.h>
@@ -67,7 +68,7 @@
"--------------------------------------------------------------------\n");
dump_cur_tlb_regs();
printk(" %08X\n", read_32bit_cp0_register(CP0_INDEX));
- printk("\n\nFull TLB Dump:"
+ printk("\n\nFull TLB Dump:\n"
"Idx EntryHi EntryLo0 EntryLo1 PageMask\n"
"--------------------------------------------------------------\n");
for (entry = 0; entry < mips_cpu.tlbsize; entry++) {
Index: tlbex-r4k.S
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips64/mm/tlbex-r4k.S,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- tlbex-r4k.S 26 Feb 2002 17:35:25 -0000 1.1
+++ tlbex-r4k.S 30 May 2002 20:42:15 -0000 1.2
@@ -26,17 +26,16 @@
.macro LOAD_PTE2, ptr, tmp
#ifdef CONFIG_SMP
- dmfc0 \tmp, CP0_CONTEXT
- dla \ptr, pgd_current
- dsrl \tmp, 23
- daddu \ptr, \tmp
+ dmfc0 \ptr, CP0_CONTEXT
+ dmfc0 \tmp, CP0_BADVADDR
+ dsra \ptr, 23 # get pgd_current[cpu]
#else
+ dmfc0 \tmp, CP0_BADVADDR
dla \ptr, pgd_current
#endif
- dmfc0 \tmp, CP0_BADVADDR
- ld \ptr, (\ptr)
bltz \tmp, kaddr
- dsrl \tmp, (PGDIR_SHIFT-3) # get pgd offset in bytes
+ ld \ptr, (\ptr)
+ dsrl \tmp, (PGDIR_SHIFT-3) # get pgd offset in bytes
andi \tmp, ((PTRS_PER_PGD - 1)<<3)
daddu \ptr, \tmp # add in pgd offset
dmfc0 \tmp, CP0_BADVADDR
|
