From: Ralf Baechle <ralf@linux-mips.org>
Date: Wed, 29 Mar 2006 17:53:00 +0000 (+0100)
Subject: [MIPS] Fix vectored interrupt support in TLB exception handler generator.
X-Git-Tag: v2.6.17-rc2~1^2~39
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=91b05e6776e173da5ce7c96d67b3ad186c4fa49f;p=linux-2.6-omap-h63xx.git

[MIPS] Fix vectored interrupt support in TLB exception handler generator.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
---

diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c
index 599b3c29718..c5eea6ae12c 100644
--- a/arch/mips/mm/tlbex.c
+++ b/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/include/asm-mips/system.h b/include/asm-mips/system.h
index 29c55e7ab31..39026690d9e 100644
--- a/include/asm-mips/system.h
+++ b/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 *);