[src/netbsd-3]: src/sys/arch/mips/mips Pull up following revision(s) (request...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7042f6c511f1
branches:  netbsd-3
changeset: 577509:7042f6c511f1
user:      tron <tron%NetBSD.org@localhost>
date:      Mon Nov 21 20:06:03 2005 +0000

description:
Pull up following revision(s) (requested by tsutsui in ticket #961):
        sys/arch/mips/mips/cache.c: revision 1.31
Check possibility of virtual alias correctly in primaly_cache_is_2way case
(though I guess all those CPUs have L1 cache larger than 8KB).

diffstat:

 sys/arch/mips/mips/cache.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (29 lines):

diff -r 7a36be1fcfdb -r 7042f6c511f1 sys/arch/mips/mips/cache.c
--- a/sys/arch/mips/mips/cache.c        Mon Nov 21 20:04:44 2005 +0000
+++ b/sys/arch/mips/mips/cache.c        Mon Nov 21 20:06:03 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cache.c,v 1.26.2.2 2005/11/21 20:04:44 tron Exp $      */
+/*     $NetBSD: cache.c,v 1.26.2.3 2005/11/21 20:06:03 tron Exp $      */
 
 /*
  * Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -68,7 +68,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cache.c,v 1.26.2.2 2005/11/21 20:04:44 tron Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cache.c,v 1.26.2.3 2005/11/21 20:06:03 tron Exp $");
 
 #include "opt_cputype.h"
 #include "opt_mips_cache.h"
@@ -499,8 +499,8 @@
 
                mips3_get_cache_config(csizebase);
 
-               if (mips_picache_size > PAGE_SIZE ||
-                   mips_pdcache_size > PAGE_SIZE)
+               if ((mips_picache_size / mips_picache_ways) > PAGE_SIZE ||
+                   (mips_pdcache_size / mips_pdcache_ways) > PAGE_SIZE)
                        mips_cache_virtual_alias = 1;
 
                switch (mips_picache_line_size) {