From 8cbd3db2ec4c707f9375eea632b548da96bd5aa6 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Mon, 19 Jun 2006 21:56:25 +0100
Subject: [PATCH] --- yaml --- r: 31253 b: refs/heads/master c:
 beab375a48f0cd90eb08f04e2c1dad67b9e6d3f8 h: refs/heads/master i:   31251:
 30e00671bf110a4ff4a63bf9598e28056d8c5277 v: v3

---
 [refs]                     |  2 +-
 trunk/arch/mips/mm/c-r4k.c | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index a2758458acc2..1b47e58937ae 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92c7b62fd1a6898fbfaf1db790ba4e70e90f39d2
+refs/heads/master: beab375a48f0cd90eb08f04e2c1dad67b9e6d3f8
diff --git a/trunk/arch/mips/mm/c-r4k.c b/trunk/arch/mips/mm/c-r4k.c
index a78355a44c41..33b1451a365d 100644
--- a/trunk/arch/mips/mm/c-r4k.c
+++ b/trunk/arch/mips/mm/c-r4k.c
@@ -1009,10 +1009,15 @@ static void __init probe_pcache(void)
 		break;
 	case CPU_24K:
 	case CPU_34K:
-		if (!(read_c0_config7() & (1 << 16)))
+		if ((read_c0_config7() & (1 << 16))) {
+			/* effectively physically indexed dcache,
+			   thus no virtual aliases. */
+			c->dcache.flags |= MIPS_CACHE_PINDEX;
+			break;
+		}
 	default:
-			if (c->dcache.waysize > PAGE_SIZE)
-				c->dcache.flags |= MIPS_CACHE_ALIASES;
+		if (c->dcache.waysize > PAGE_SIZE)
+			c->dcache.flags |= MIPS_CACHE_ALIASES;
 	}
 
 	switch (c->cputype) {