From 72b632549fb76c40ce1156df838e9aaa7fccbee4 Mon Sep 17 00:00:00 2001
From: Nigel Stephens <nigel@mips.com>
Date: Thu, 27 Apr 2006 15:50:32 +0100
Subject: [PATCH] --- yaml --- r: 27057 b: refs/heads/master c:
 98a41de99a4e4febe99b22c3a28d434caeb3165c h: refs/heads/master i:   27055:
 b66b89c5ce8d75367a14ac30dc4e4758f331b149 v: v3

---
 [refs]                         | 2 +-
 trunk/arch/mips/kernel/traps.c | 1 +
 trunk/arch/mips/mm/c-r4k.c     | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e8735151c80f..c3ca5bd091d0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e9538917c5f62c1a1598da9b898702800801b98
+refs/heads/master: 98a41de99a4e4febe99b22c3a28d434caeb3165c
diff --git a/trunk/arch/mips/kernel/traps.c b/trunk/arch/mips/kernel/traps.c
index 4901f0a37fca..35cb08da3820 100644
--- a/trunk/arch/mips/kernel/traps.c
+++ b/trunk/arch/mips/kernel/traps.c
@@ -902,6 +902,7 @@ static inline void parity_protection_init(void)
 {
 	switch (current_cpu_data.cputype) {
 	case CPU_24K:
+	case CPU_34K:
 	case CPU_5KC:
 		write_c0_ecc(0x80000000);
 		back_to_back_c0_hazard();
diff --git a/trunk/arch/mips/mm/c-r4k.c b/trunk/arch/mips/mm/c-r4k.c
index 4182e1176fae..4420191795f3 100644
--- a/trunk/arch/mips/mm/c-r4k.c
+++ b/trunk/arch/mips/mm/c-r4k.c
@@ -968,6 +968,7 @@ static void __init probe_pcache(void)
 	case CPU_SB1:
 		break;
 	case CPU_24K:
+	case CPU_34K:
 		if (!(read_c0_config7() & (1 << 16)))
 	default:
 			if (c->dcache.waysize > PAGE_SIZE)