From 8813e85455b51189188fd60e81270afea0483bca Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Wed, 28 Jan 2009 18:48:23 +0000
Subject: [PATCH] --- yaml --- r: 130559 b: refs/heads/master c:
 42fe7ee31ff904b2419f02864938966c8f0b6edc h: refs/heads/master i:   130557:
 5b21dc02d3b38424e066729c630b123f0678d7d3   130555:
 1f2db29303a11aab9dbb4951c856750591cbd4fc   130551:
 71d1176ea435bb94133b652c70926922fdb08ef2   130543:
 54dd2d2b06b6e42dc18b5123cebfd3071fd9558b   130527:
 675d6ec908eec3a62201fce378741d2067dc4a6d   130495:
 c9f92b8a7368ac495837f45d7da819c5961e96a9   130431:
 bc30172cc285d183c904ba592b9ce3c4cfdf1c3d   130303:
 28db0b7c931bfb0e5b07a4d16734310343b19ec0   130047:
 1c6e33aa348a09cce2b27e193bf121abfa4520af v: v3

---
 [refs]                         | 2 +-
 trunk/arch/mips/kernel/traps.c | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index db2f297751fd..2dd8be6acda0 100644
--- 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
index f6083c6bfaa4..fa06460cbf2c 100644
--- 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);