Module Name: src
Committed By: macallan
Date: Thu Feb 10 06:42:18 UTC 2011
Modified Files:
src/sys/arch/mips/mips: pmap.c
Log Message:
unbork PMAP_NOCACHE vs. PGC_NOCACHE
To generate a diff of this commit:
cvs rdiff -u -r1.193 -r1.194 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.193 src/sys/arch/mips/mips/pmap.c:1.194
--- src/sys/arch/mips/mips/pmap.c:1.193 Wed Jan 26 01:18:54 2011
+++ src/sys/arch/mips/mips/pmap.c Thu Feb 10 06:42:17 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.193 2011/01/26 01:18:54 pooka Exp $ */
+/* $NetBSD: pmap.c,v 1.194 2011/02/10 06:42:17 macallan 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.193 2011/01/26 01:18:54 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.194 2011/02/10 06:42:17 macallan Exp $");
/*
* Manages physical address maps.
@@ -1192,14 +1192,13 @@
if (pa & 0x80000000) /* this is not error in general. */
panic("pmap_enter: pa");
#endif
+ if (flags & PMAP_NOCACHE)
+ cached = 0;
#if defined(_MIPS_PADDR_T_64BIT) || defined(_LP64)
- if (flags & PMAP_NOCACHE) {
+ if (pa & PGC_NOCACHE) {
cached = 0;
pa &= ~PGC_NOCACHE;
- } else {
- cached = 1;
- pa |= PGC_NOCACHE;
}
#endif
