[src/trunk]: src/sys/arch/mips/mips Fix "removing options MIPS3 cause DS5000 ...

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

details:   https://anonhg.NetBSD.org/src/rev/39388110165a
branches:  trunk
changeset: 764743:39388110165a
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Mon May 02 15:31:01 2011 +0000

description:
Fix "removing options MIPS3 cause DS5000 to loop during boot"
(i.e. no options MIPS3 kernel doesn't work on MIPS1) problem.

Reported and tested by Erik Bertelsen on port-pmax:
http://mail-index.NetBSD.org/port-pmax/2011/04/21/msg000099.html

diffstat:

 sys/arch/mips/mips/pmap.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (34 lines):

diff -r fee06e8cbad4 -r 39388110165a sys/arch/mips/mips/pmap.c
--- a/sys/arch/mips/mips/pmap.c Mon May 02 14:23:24 2011 +0000
+++ b/sys/arch/mips/mips/pmap.c Mon May 02 15:31:01 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.199 2011/04/29 22:18:53 matt Exp $  */
+/*     $NetBSD: pmap.c,v 1.200 2011/05/02 15:31:01 tsutsui Exp $       */
 
 /*-
  * Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.199 2011/04/29 22:18:53 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.200 2011/05/02 15:31:01 tsutsui Exp $");
 
 /*
  *     Manages physical address maps.
@@ -2346,6 +2346,7 @@
                        pmap_page_cache(pg, true);
        }
 #endif
+#endif /* MIPS3_PLUS */
 
        pmap_check_pvlist(md);
        PG_MD_PVLIST_UNLOCK(md);
@@ -2372,6 +2373,7 @@
                        PMAP_COUNT(exec_synced_remove);
                }
        }
+#ifdef MIPS3_PLUS      /* XXX mmu XXX */
        if (MIPS_HAS_R4K_MMU && last)   /* XXX why */
                mips_dcache_wbinv_range_index(va, PAGE_SIZE);
 #endif /* MIPS3_PLUS */