linux-mips
[Top] [All Lists]

[PATCH] mips/traps: use CKSEG1ADDR for uncache handler

To: Ralf Baechle <ralf@linux-mips.org>
Subject: [PATCH] mips/traps: use CKSEG1ADDR for uncache handler
From: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
Date: Tue, 27 Apr 2010 22:53:30 +0200
Cc: linux-mips@linux-mips.org
Original-recipient: rfc822;linux-mips@linux-mips.org
Sender: linux-mips-bounce@linux-mips.org
User-agent: Mutt/1.5.20 (2009-06-14)
since "MIPS: Calculate proper ebase value for 64-bit kernels" my mips
toy did not boot anymore.
Before that commit we always touched xkphys/shared as ebase and computed
xphsys/unchached for that area. After that commit ebase become 32bit
compat address and convert does not work anymore. So I guess now want to
touch the 32bit compat unmapped & uncached area for this. CKSEG1ADDR
does just in 32bit and 64bit.

Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
---
 arch/mips/kernel/traps.c |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index 4e00f9b..1b57f18 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -1557,12 +1557,7 @@ static char panic_null_cerr[] __cpuinitdata =
 void __cpuinit set_uncached_handler(unsigned long offset, void *addr,
        unsigned long size)
 {
-#ifdef CONFIG_32BIT
-       unsigned long uncached_ebase = KSEG1ADDR(ebase);
-#endif
-#ifdef CONFIG_64BIT
-       unsigned long uncached_ebase = TO_UNCAC(ebase);
-#endif
+       unsigned long uncached_ebase = CKSEG1ADDR(ebase);
 
        if (!addr)
                panic(panic_null_cerr);
-- 
1.6.6.1


<Prev in Thread] Current Thread [Next in Thread>