From 8c1f7ade60dc62bba0e4fdbceb528c32ddabbaf3 Mon Sep 17 00:00:00 2001
From: David Daney <ddaney@caviumnetworks.com>
Date: Tue, 6 Apr 2010 13:29:50 -0700
Subject: [PATCH] --- yaml --- r: 189795 b: refs/heads/master c:
 f6be75d03c8870be91e6e2a195648ece04b6bb16 h: refs/heads/master i:   189793:
 add4236fb4cc06443aaaa5469f2618ad0666f83a   189791:
 03e48d388bffed9df65647b916d00b98832ccfe0 v: v3

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

diff --git a/[refs] b/[refs]
index 120b8bb5d249..34fe81d5eeaf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d8000beef2cd10c16dc5f66af715f692f5992652
+refs/heads/master: f6be75d03c8870be91e6e2a195648ece04b6bb16
diff --git a/trunk/arch/mips/kernel/traps.c b/trunk/arch/mips/kernel/traps.c
index 4e00f9bc23ee..1a4dd657ccb9 100644
--- a/trunk/arch/mips/kernel/traps.c
+++ b/trunk/arch/mips/kernel/traps.c
@@ -1599,7 +1599,7 @@ void __init trap_init(void)
 		ebase = (unsigned long)
 			__alloc_bootmem(size, 1 << fls(size), 0);
 	} else {
-		ebase = CAC_BASE;
+		ebase = CKSEG0;
 		if (cpu_has_mips_r2)
 			ebase += (read_c0_ebase() & 0x3ffff000);
 	}