---

yaml --- r: 25929 b: refs/heads/master c: 91b05e6 h: refs/heads/master i: 25927: 06dd42c v: v3
git-mirror · Apr 19, 2006 · fbaa584 · fbaa584
1 parent 4c23004
commit fbaa584
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15c4f67ab81b07d3b579a11fc4a30da84c0d4858
+refs/heads/master: 91b05e6776e173da5ce7c96d67b3ad186c4fa49f
diff --git a/trunk/arch/mips/mm/tlbex.c b/trunk/arch/mips/mm/tlbex.c
@@ -742,7 +742,7 @@ static void __init build_r3000_tlb_refill_handler(void)
 	}
 #endif
 
-	memcpy((void *)CAC_BASE, tlb_handler, 0x80);
+	memcpy((void *)ebase, tlb_handler, 0x80);
 }
 
 /*
@@ -1247,7 +1247,7 @@ static void __init build_r4000_tlb_refill_handler(void)
 	}
 #endif
 
-	memcpy((void *)CAC_BASE, final_handler, 0x100);
+	memcpy((void *)ebase, final_handler, 0x100);
 }
 
 /*

diff --git a/trunk/include/asm-mips/system.h b/trunk/include/asm-mips/system.h
@@ -441,6 +441,7 @@ extern void set_handler (unsigned long offset, void *addr, unsigned long len);
 extern void set_uncached_handler (unsigned long offset, void *addr, unsigned long len);
 extern void *set_vi_handler (int n, void *addr);
 extern void *set_except_vector(int n, void *addr);
+extern unsigned long ebase;
 extern void per_cpu_trap_init(void);
 
 extern NORET_TYPE void die(const char *, struct pt_regs *);
-Original file line number
+Diff line change
@@ Expand Up / @@ -742,7 +742,7 @@ static void __init build_r3000_tlb_refill_handler(void) @@
     	}
     #endif
-    	memcpy((void *)CAC_BASE, tlb_handler, 0x80);
+    	memcpy((void *)ebase, tlb_handler, 0x80);
     }
     /*
@@ Expand Down Expand Up / @@ -1247,7 +1247,7 @@ static void __init build_r4000_tlb_refill_handler(void) @@
     	}
     #endif
-    	memcpy((void *)CAC_BASE, final_handler, 0x100);
+    	memcpy((void *)ebase, final_handler, 0x100);
     }
     /*
@@ Expand Down @@