Commit 42fe7ee3 authored by Ralf Baechle's avatar Ralf Baechle

MIPS: R2: Fix broken installation of cache error handler.

Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 634286f1
...@@ -1582,7 +1582,11 @@ void __init set_handler(unsigned long offset, void *addr, unsigned long size) ...@@ -1582,7 +1582,11 @@ void __init set_handler(unsigned long offset, void *addr, unsigned long size)
static char panic_null_cerr[] __cpuinitdata = static char panic_null_cerr[] __cpuinitdata =
"Trying to set NULL cache error exception handler"; "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, void __cpuinit set_uncached_handler(unsigned long offset, void *addr,
unsigned long size) unsigned long size)
{ {
...@@ -1593,7 +1597,7 @@ void __cpuinit set_uncached_handler(unsigned long offset, void *addr, ...@@ -1593,7 +1597,7 @@ void __cpuinit set_uncached_handler(unsigned long offset, void *addr,
unsigned long uncached_ebase = TO_UNCAC(ebase); unsigned long uncached_ebase = TO_UNCAC(ebase);
#endif #endif
if (cpu_has_mips_r2) if (cpu_has_mips_r2)
ebase += (read_c0_ebase() & 0x3ffff000); uncached_ebase += (read_c0_ebase() & 0x3ffff000);
if (!addr) if (!addr)
panic(panic_null_cerr); panic(panic_null_cerr);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment