---

yaml --- r: 130559 b: refs/heads/master c: 42fe7ee h: refs/heads/master i: 130557: 5b21dc0 130555: 1f2db29 130551: 71d1176 130543: 54dd2d2 130527: 675d6ec 130495: c9f92b8 130431: bc30172 130303: 28db0b7 130047: 1c6e33a v: v3
git-mirror · Jan 30, 2009 · 8813e85 · 8813e85
1 parent c2709fe
commit 8813e85
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 634286f127bef8799cd04799d3e1d5471e8fd91c
+refs/heads/master: 42fe7ee31ff904b2419f02864938966c8f0b6edc
diff --git a/trunk/arch/mips/kernel/traps.c b/trunk/arch/mips/kernel/traps.c
@@ -1582,7 +1582,11 @@ void __init set_handler(unsigned long offset, void *addr, unsigned long size)
 static char panic_null_cerr[] __cpuinitdata =
 	"Trying to set NULL cache error exception handler";
 
-/* Install uncached CPU exception handler */
+/*
+ * Install uncached CPU exception handler.
+ * This is suitable only for the cache error exception which is the only
+ * exception handler that is being run uncached.
+ */
 void __cpuinit set_uncached_handler(unsigned long offset, void *addr,
 	unsigned long size)
 {
@@ -1593,7 +1597,7 @@ void __cpuinit set_uncached_handler(unsigned long offset, void *addr,
 	unsigned long uncached_ebase = TO_UNCAC(ebase);
 #endif
 	if (cpu_has_mips_r2)
-		ebase += (read_c0_ebase() & 0x3ffff000);
+		uncached_ebase += (read_c0_ebase() & 0x3ffff000);
 
 	if (!addr)
 		panic(panic_null_cerr);