Module Name: src
Committed By: tsutsui
Date: Mon May 2 15:31:01 UTC 2011
Modified Files:
src/sys/arch/mips/mips: pmap.c
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.199 -r1.200 src/sys/arch/mips/mips/pmap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/mips/pmap.c
diff -u src/sys/arch/mips/mips/pmap.c:1.199 src/sys/arch/mips/mips/pmap.c:1.200
--- src/sys/arch/mips/mips/pmap.c:1.199 Fri Apr 29 22:18:53 2011
+++ src/sys/arch/mips/mips/pmap.c Mon May 2 15:31:01 2011
@@ -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 */
