From fbaa5848a6e36870d48d1bf8a4beafa4495b44d8 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Wed, 29 Mar 2006 18:53:00 +0100
Subject: [PATCH] --- yaml --- r: 25929 b: refs/heads/master c:
 91b05e6776e173da5ce7c96d67b3ad186c4fa49f h: refs/heads/master i:   25927:
 06dd42c52fe62f9118484f1424199124f0618001 v: v3

---
 [refs]                          | 2 +-
 trunk/arch/mips/mm/tlbex.c      | 4 ++--
 trunk/include/asm-mips/system.h | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index cef56d8cb7bf..c1fd5a905d0e 100644
--- 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
index 599b3c297186..c5eea6ae12ca 100644
--- 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
index 29c55e7ab311..39026690d9e4 100644
--- 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 *);