Module Name: src
Committed By: matt
Date: Wed Aug 29 17:08:41 UTC 2012
Modified Files:
src/sys/arch/arm/arm32: pmap.c
Log Message:
Support PMAP_NOCACHE in pmap_kenter_pa
To generate a diff of this commit:
cvs rdiff -u -r1.232 -r1.233 src/sys/arch/arm/arm32/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/arm/arm32/pmap.c
diff -u src/sys/arch/arm/arm32/pmap.c:1.232 src/sys/arch/arm/arm32/pmap.c:1.233
--- src/sys/arch/arm/arm32/pmap.c:1.232 Wed Aug 29 05:51:30 2012
+++ src/sys/arch/arm/arm32/pmap.c Wed Aug 29 17:08:41 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.232 2012/08/29 05:51:30 matt Exp $ */
+/* $NetBSD: pmap.c,v 1.233 2012/08/29 17:08:41 matt Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -211,7 +211,7 @@
#include <machine/param.h>
#include <arm/arm32/katelib.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.232 2012/08/29 05:51:30 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.233 2012/08/29 17:08:41 matt Exp $");
#ifdef PMAP_DEBUG
@@ -3361,8 +3361,8 @@ pmap_kenter_pa(vaddr_t va, paddr_t pa, v
}
}
- *ptep = L2_S_PROTO | pa | L2_S_PROT(PTE_KERNEL, prot) |
- pte_l2_s_cache_mode;
+ *ptep = L2_S_PROTO | pa | L2_S_PROT(PTE_KERNEL, prot)
+ | ((flags & PMAP_NOCACHE) ? 0 : pte_l2_s_cache_mode);
PTE_SYNC(ptep);
if (pg) {
