Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/mips/mips Protect uses of MIPS_R5000 with #ifndef E...



details:   https://anonhg.NetBSD.org/src/rev/158ba02a3381
branches:  trunk
changeset: 544003:158ba02a3381
user:      rafal <rafal%NetBSD.org@localhost>
date:      Sat Mar 08 05:18:25 2003 +0000

description:
Protect uses of MIPS_R5000 with #ifndef ENABLE_MIPS_R3NKK in new code just
as the old code does.

diffstat:

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

diffs (28 lines):

diff -r 6e8ec0dc5271 -r 158ba02a3381 sys/arch/mips/mips/cache.c
--- a/sys/arch/mips/mips/cache.c        Sat Mar 08 04:43:24 2003 +0000
+++ b/sys/arch/mips/mips/cache.c        Sat Mar 08 05:18:25 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cache.c,v 1.18 2003/03/08 04:43:24 rafal Exp $ */
+/*     $NetBSD: cache.c,v 1.19 2003/03/08 05:18:25 rafal Exp $ */
 
 /*
  * Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -826,10 +826,15 @@
        mips_cache_prefer_mask =
            max(mips_pdcache_size, mips_picache_size) - 1;
 
-       if (MIPS_PRID_IMPL(cpu_id) == MIPS_R5000 || 
-           MIPS_PRID_IMPL(cpu_id) == MIPS_RM5200)
+       switch(MIPS_PRID_IMPL(cpu_id)) {
+#ifndef ENABLE_MIPS_R3NKK
+       case MIPS_R5000:
+#endif
+       case MIPS_RM5200:
                has_sdcache_enable = 1;
-       
+               break;
+       }
+
        /* 
         * If CPU has a software-enabled L2 cache, check both if it's
         * present and if it's enabled before making assumptions the



Home | Main Index | Thread Index | Old Index