From d65587cc761150824850841f990463e73be96d20 Mon Sep 17 00:00:00 2001
From: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
Date: Tue, 27 Apr 2010 22:53:30 +0200
Subject: [PATCH] --- yaml --- r: 190504 b: refs/heads/master c:
 4f81b01a30ffb338068d611e27da18c08db55464 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 3c0de914d6c4..c8f1779adb90 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ec56329ff939aba29291c0dec1a28ceed660162
+refs/heads/master: 4f81b01a30ffb338068d611e27da18c08db55464
diff --git a/trunk/arch/mips/kernel/traps.c b/trunk/arch/mips/kernel/traps.c
index 36460c7b7cc8..d612c6dcb746 100644
--- a/trunk/arch/mips/kernel/traps.c
+++ b/trunk/arch/mips/kernel/traps.c
@@ -1562,12 +1562,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);