Module Name: src
Committed By: uebayasi
Date: Sun Oct 31 03:46:20 UTC 2010
Modified Files:
src/sys/arch/arm/arm32 [uebayasi-xip]: pmap.c
src/sys/arch/hppa/hppa [uebayasi-xip]: pmap.c
src/sys/arch/m68k/m68k [uebayasi-xip]: pmap_motorola.c
src/sys/arch/mips/mips [uebayasi-xip]: pmap.c
src/sys/arch/powerpc/ibm4xx [uebayasi-xip]: pmap.c
src/sys/arch/sh3/sh3 [uebayasi-xip]: pmap.c
src/sys/arch/sparc64/sparc64 [uebayasi-xip]: pmap.c
src/sys/arch/x86/x86 [uebayasi-xip]: pmap.c
src/sys/uvm [uebayasi-xip]: uvm_device.c uvm_pmap.h
Log Message:
We already have a flag PMAP_NOCACHE. s/PMAP_UNMANAGED/PMAN_NOCACHE/.
Pointed out by Chuck Silvers, thanks.
To generate a diff of this commit:
cvs rdiff -u -r1.211.2.17 -r1.211.2.18 src/sys/arch/arm/arm32/pmap.c
cvs rdiff -u -r1.63.2.8 -r1.63.2.9 src/sys/arch/hppa/hppa/pmap.c
cvs rdiff -u -r1.55.2.4 -r1.55.2.5 src/sys/arch/m68k/m68k/pmap_motorola.c
cvs rdiff -u -r1.188.2.5 -r1.188.2.6 src/sys/arch/mips/mips/pmap.c
cvs rdiff -u -r1.60.2.6 -r1.60.2.7 src/sys/arch/powerpc/ibm4xx/pmap.c
cvs rdiff -u -r1.74.2.4 -r1.74.2.5 src/sys/arch/sh3/sh3/pmap.c
cvs rdiff -u -r1.250.2.5 -r1.250.2.6 src/sys/arch/sparc64/sparc64/pmap.c
cvs rdiff -u -r1.100.2.5 -r1.100.2.6 src/sys/arch/x86/x86/pmap.c
cvs rdiff -u -r1.57.2.2 -r1.57.2.3 src/sys/uvm/uvm_device.c
cvs rdiff -u -r1.32.2.5 -r1.32.2.6 src/sys/uvm/uvm_pmap.h
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/arm/arm32/pmap.c
diff -u src/sys/arch/arm/arm32/pmap.c:1.211.2.17 src/sys/arch/arm/arm32/pmap.c:1.211.2.18
--- src/sys/arch/arm/arm32/pmap.c:1.211.2.17 Sun Oct 31 03:43:02 2010
+++ src/sys/arch/arm/arm32/pmap.c Sun Oct 31 03:46:16 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.211.2.17 2010/10/31 03:43:02 uebayasi Exp $ */
+/* $NetBSD: pmap.c,v 1.211.2.18 2010/10/31 03:46:16 uebayasi Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -212,7 +212,7 @@
#include <machine/param.h>
#include <arm/arm32/katelib.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.211.2.17 2010/10/31 03:43:02 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.211.2.18 2010/10/31 03:46:16 uebayasi Exp $");
#ifdef PMAP_DEBUG
@@ -2777,7 +2777,7 @@
* Get a pointer to the page. Later on in this function, we
* test for a managed page by checking pg != NULL.
*/
- pg = (pmap_initialized && ((flags & PMAP_UNMANAGED) == 0)) ?
+ pg = (pmap_initialized && ((flags & PMAP_NOCACHE) == 0)) ?
PHYS_TO_VM_PAGE(pa) : NULL;
nflags = 0;
Index: src/sys/arch/hppa/hppa/pmap.c
diff -u src/sys/arch/hppa/hppa/pmap.c:1.63.2.8 src/sys/arch/hppa/hppa/pmap.c:1.63.2.9
--- src/sys/arch/hppa/hppa/pmap.c:1.63.2.8 Sat Oct 30 08:41:07 2010
+++ src/sys/arch/hppa/hppa/pmap.c Sun Oct 31 03:46:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.63.2.8 2010/10/30 08:41:07 uebayasi Exp $ */
+/* $NetBSD: pmap.c,v 1.63.2.9 2010/10/31 03:46:17 uebayasi Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.63.2.8 2010/10/30 08:41:07 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.63.2.9 2010/10/31 03:46:17 uebayasi Exp $");
#include "opt_xip.h"
@@ -1232,7 +1232,7 @@
ptp->wire_count++;
}
- if (pmap_initialized && ((flags & PMAP_UNMANAGED) == 0) &&
+ if (pmap_initialized && ((flags & PMAP_NOCACHE) == 0) &&
(pg = PHYS_TO_VM_PAGE(pa))) {
struct vm_page_md * const md = VM_PAGE_TO_MD(pg);
Index: src/sys/arch/m68k/m68k/pmap_motorola.c
diff -u src/sys/arch/m68k/m68k/pmap_motorola.c:1.55.2.4 src/sys/arch/m68k/m68k/pmap_motorola.c:1.55.2.5
--- src/sys/arch/m68k/m68k/pmap_motorola.c:1.55.2.4 Sat Oct 30 08:41:08 2010
+++ src/sys/arch/m68k/m68k/pmap_motorola.c Sun Oct 31 03:46:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_motorola.c,v 1.55.2.4 2010/10/30 08:41:08 uebayasi Exp $ */
+/* $NetBSD: pmap_motorola.c,v 1.55.2.5 2010/10/31 03:46:17 uebayasi Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -119,7 +119,7 @@
#include "opt_m68k_arch.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap_motorola.c,v 1.55.2.4 2010/10/30 08:41:08 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_motorola.c,v 1.55.2.5 2010/10/31 03:46:17 uebayasi Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1272,7 +1272,7 @@
* Note that we raise IPL while manipulating pv_table
* since pmap_enter can be called at interrupt time.
*/
- if (PAGE_IS_MANAGED(pa) && ((flags & PMAP_UNMANAGED) == 0)) {
+ if (PAGE_IS_MANAGED(pa) && ((flags & PMAP_NOCACHE) == 0)) {
struct pv_header *pvh;
struct pv_entry *pv, *npv;
int s;
Index: src/sys/arch/mips/mips/pmap.c
diff -u src/sys/arch/mips/mips/pmap.c:1.188.2.5 src/sys/arch/mips/mips/pmap.c:1.188.2.6
--- src/sys/arch/mips/mips/pmap.c:1.188.2.5 Sat Oct 30 08:41:09 2010
+++ src/sys/arch/mips/mips/pmap.c Sun Oct 31 03:46:18 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.188.2.5 2010/10/30 08:41:09 uebayasi Exp $ */
+/* $NetBSD: pmap.c,v 1.188.2.6 2010/10/31 03:46:18 uebayasi 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.188.2.5 2010/10/30 08:41:09 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.188.2.6 2010/10/31 03:46:18 uebayasi Exp $");
/*
* Manages physical address maps.
@@ -1193,7 +1193,7 @@
if (!(prot & VM_PROT_READ))
panic("pmap_enter: prot");
#endif
- if ((flags & PMAP_UNMANAGED) != 0)
+ if ((flags & PMAP_NOCACHE) != 0)
pg = NULL;
else
pg = PHYS_TO_VM_PAGE(pa);
Index: src/sys/arch/powerpc/ibm4xx/pmap.c
diff -u src/sys/arch/powerpc/ibm4xx/pmap.c:1.60.2.6 src/sys/arch/powerpc/ibm4xx/pmap.c:1.60.2.7
--- src/sys/arch/powerpc/ibm4xx/pmap.c:1.60.2.6 Sat Oct 30 08:41:10 2010
+++ src/sys/arch/powerpc/ibm4xx/pmap.c Sun Oct 31 03:46:18 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.60.2.6 2010/10/30 08:41:10 uebayasi Exp $ */
+/* $NetBSD: pmap.c,v 1.60.2.7 2010/10/31 03:46:18 uebayasi Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.60.2.6 2010/10/30 08:41:10 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.60.2.7 2010/10/31 03:46:18 uebayasi Exp $");
#include "opt_xip.h"
@@ -851,7 +851,7 @@
if (flags & PMAP_WIRED)
flags |= prot;
- managed = ((flags & PMAP_UNMANAGED) == 0) && uvm_pageismanaged(pa);
+ managed = ((flags & PMAP_NOCACHE) == 0) && uvm_pageismanaged(pa);
/*
* Generate TTE.
Index: src/sys/arch/sh3/sh3/pmap.c
diff -u src/sys/arch/sh3/sh3/pmap.c:1.74.2.4 src/sys/arch/sh3/sh3/pmap.c:1.74.2.5
--- src/sys/arch/sh3/sh3/pmap.c:1.74.2.4 Sat Oct 30 08:41:11 2010
+++ src/sys/arch/sh3/sh3/pmap.c Sun Oct 31 03:46:18 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.74.2.4 2010/10/30 08:41:11 uebayasi Exp $ */
+/* $NetBSD: pmap.c,v 1.74.2.5 2010/10/31 03:46:18 uebayasi Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.74.2.4 2010/10/30 08:41:11 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.74.2.5 2010/10/31 03:46:18 uebayasi Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -333,7 +333,7 @@
/* "flags" never exceed "prot" */
KDASSERT(prot != 0 && ((flags & VM_PROT_ALL) & ~prot) == 0);
- if ((flags & PMAP_UNMANAGED) != 0)
+ if ((flags & PMAP_NOCACHE) != 0)
pg = NULL;
else
pg = PHYS_TO_VM_PAGE(pa);
Index: src/sys/arch/sparc64/sparc64/pmap.c
diff -u src/sys/arch/sparc64/sparc64/pmap.c:1.250.2.5 src/sys/arch/sparc64/sparc64/pmap.c:1.250.2.6
--- src/sys/arch/sparc64/sparc64/pmap.c:1.250.2.5 Sat Oct 30 08:41:11 2010
+++ src/sys/arch/sparc64/sparc64/pmap.c Sun Oct 31 03:46:19 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.250.2.5 2010/10/30 08:41:11 uebayasi Exp $ */
+/* $NetBSD: pmap.c,v 1.250.2.6 2010/10/31 03:46:19 uebayasi Exp $ */
/*
*
* Copyright (C) 1996-1999 Eduardo Horvath.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.250.2.5 2010/10/30 08:41:11 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.250.2.6 2010/10/31 03:46:19 uebayasi Exp $");
#undef NO_VCACHE /* Don't forget the locked TLB in dostart */
#define HWREF
@@ -1715,7 +1715,7 @@
/*
* Construct the TTE.
*/
- if ((flags & PMAP_UNMANAGED) != 0)
+ if ((flags & PMAP_NOCACHE) != 0)
pg = NULL;
else
pg = PHYS_TO_VM_PAGE(pa);
Index: src/sys/arch/x86/x86/pmap.c
diff -u src/sys/arch/x86/x86/pmap.c:1.100.2.5 src/sys/arch/x86/x86/pmap.c:1.100.2.6
--- src/sys/arch/x86/x86/pmap.c:1.100.2.5 Sat Oct 30 08:41:13 2010
+++ src/sys/arch/x86/x86/pmap.c Sun Oct 31 03:46:19 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.100.2.5 2010/10/30 08:41:13 uebayasi Exp $ */
+/* $NetBSD: pmap.c,v 1.100.2.6 2010/10/31 03:46:19 uebayasi Exp $ */
/*
* Copyright (c) 2007 Manuel Bouyer.
@@ -149,7 +149,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.100.2.5 2010/10/30 08:41:13 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.100.2.6 2010/10/31 03:46:19 uebayasi Exp $");
#include "opt_user_ldt.h"
#include "opt_lockdebug.h"
@@ -4039,7 +4039,7 @@
else
#endif
{
- if ((flags & PMAP_UNMANAGED) != 0)
+ if ((flags & PMAP_NOCACHE) != 0)
pg = NULL;
else
pg = PHYS_TO_VM_PAGE(pa);
Index: src/sys/uvm/uvm_device.c
diff -u src/sys/uvm/uvm_device.c:1.57.2.2 src/sys/uvm/uvm_device.c:1.57.2.3
--- src/sys/uvm/uvm_device.c:1.57.2.2 Fri May 28 15:26:22 2010
+++ src/sys/uvm/uvm_device.c Sun Oct 31 03:46:19 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_device.c,v 1.57.2.2 2010/05/28 15:26:22 uebayasi Exp $ */
+/* $NetBSD: uvm_device.c,v 1.57.2.3 2010/10/31 03:46:19 uebayasi Exp $ */
/*
*
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_device.c,v 1.57.2.2 2010/05/28 15:26:22 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_device.c,v 1.57.2.3 2010/10/31 03:46:19 uebayasi Exp $");
#include "opt_uvmhist.h"
@@ -428,12 +428,12 @@
ufi->orig_map->pmap, curr_va, paddr, mapprot);
/*
* XXXUEBS
- * always map device pages as unmanaged (uncached) for
- * now. this may be changed when UVM will support some
+ * always map device pages as uncached for now.
+ * this may be changed when UVM will support some
* "managed" device pages like PAT in the future.
*/
if (pmap_enter(ufi->orig_map->pmap, curr_va, paddr,
- mapprot, PMAP_CANFAIL | PMAP_UNMANAGED | mapprot) != 0) {
+ mapprot, PMAP_CANFAIL | PMAP_NOCACHE | mapprot) != 0) {
/*
* pmap_enter() didn't have the resource to
* enter this mapping. Unlock everything,
Index: src/sys/uvm/uvm_pmap.h
diff -u src/sys/uvm/uvm_pmap.h:1.32.2.5 src/sys/uvm/uvm_pmap.h:1.32.2.6
--- src/sys/uvm/uvm_pmap.h:1.32.2.5 Sat Oct 30 08:41:14 2010
+++ src/sys/uvm/uvm_pmap.h Sun Oct 31 03:46:20 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_pmap.h,v 1.32.2.5 2010/10/30 08:41:14 uebayasi Exp $ */
+/* $NetBSD: uvm_pmap.h,v 1.32.2.6 2010/10/31 03:46:20 uebayasi Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -108,7 +108,6 @@
#else
#define PMAP_KMPAGE 0x00000000
#endif /* PMAP_ENABLE_PMAP_KMPAGE */
-#define PMAP_UNMANAGED 0x00000080 /* treat managed pages as unmanaged */
#define PMAP_MD_MASK 0xff000000 /* [BOTH] Machine-dependent bits */
#define PMAP_PROT_MASK 0x0000000f /* [BOTH] VM_PROT_* bit mask */
