Module Name: src
Committed By: thorpej
Date: Wed Aug 19 23:54:34 UTC 2009
Modified Files:
src/sys/arch/arm/include/arm32: pmap.h
src/sys/uvm: uvm_pmap.h
Log Message:
Use PMAP_ENABLE_PMAP_KMPAGE to enable PMAP_KMPAGE. We still want the bit
defined in the MI space, not in an MD header.
To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 src/sys/arch/arm/include/arm32/pmap.h
cvs rdiff -u -r1.29 -r1.30 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/include/arm32/pmap.h
diff -u src/sys/arch/arm/include/arm32/pmap.h:1.91 src/sys/arch/arm/include/arm32/pmap.h:1.92
--- src/sys/arch/arm/include/arm32/pmap.h:1.91 Wed Aug 19 14:58:48 2009
+++ src/sys/arch/arm/include/arm32/pmap.h Wed Aug 19 23:54:33 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.91 2009/08/19 14:58:48 thorpej Exp $ */
+/* $NetBSD: pmap.h,v 1.92 2009/08/19 23:54:33 thorpej Exp $ */
/*
* Copyright (c) 2002, 2003 Wasabi Systems, Inc.
@@ -290,6 +290,7 @@
#define PMAP_NEED_PROCWR
#define PMAP_GROWKERNEL /* turn on pmap_growkernel interface */
+#define PMAP_ENABLE_PMAP_KMPAGE /* enable the PMAP_KMPAGE flag */
#if ARM_MMU_V6 > 0
#define PMAP_PREFER(hint, vap, sz, td) pmap_prefer((hint), (vap), (td))
Index: src/sys/uvm/uvm_pmap.h
diff -u src/sys/uvm/uvm_pmap.h:1.29 src/sys/uvm/uvm_pmap.h:1.30
--- src/sys/uvm/uvm_pmap.h:1.29 Wed Aug 19 14:58:48 2009
+++ src/sys/uvm/uvm_pmap.h Wed Aug 19 23:54:33 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_pmap.h,v 1.29 2009/08/19 14:58:48 thorpej Exp $ */
+/* $NetBSD: uvm_pmap.h,v 1.30 2009/08/19 23:54:33 thorpej Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -103,7 +103,11 @@
*/
#define PMAP_WIRED 0x00000010 /* wired mapping */
#define PMAP_CANFAIL 0x00000020 /* can fail if resource shortage */
+#if defined(PMAP_ENABLE_PMAP_KMPAGE)
#define PMAP_KMPAGE 0x00000040 /* [PA] page used for kernel memory */
+#else
+#define PMAP_KMPAGE 0x00000000
+#endif /* PMAP_ENABLE_PMAP_KMPAGE */
#define PMAP_MD_MASK 0xff000000 /* Machine-dependent bits */
