Module Name: src Committed By: macallan Date: Mon Feb 4 13:37:30 UTC 2013
Modified Files: src/sys/arch/arm/arm32: pmap.c Log Message: support ARM32_MMAP_WRITECOMBINE for managed pages as well To generate a diff of this commit: cvs rdiff -u -r1.251 -r1.252 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.251 src/sys/arch/arm/arm32/pmap.c:1.252 --- src/sys/arch/arm/arm32/pmap.c:1.251 Fri Feb 1 15:02:31 2013 +++ src/sys/arch/arm/arm32/pmap.c Mon Feb 4 13:37:30 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.251 2013/02/01 15:02:31 matt Exp $ */ +/* $NetBSD: pmap.c,v 1.252 2013/02/04 13:37:30 macallan Exp $ */ /* * Copyright 2003 Wasabi Systems, Inc. @@ -212,7 +212,7 @@ #include <arm/cpuconf.h> #include <arm/arm32/katelib.h> -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.251 2013/02/01 15:02:31 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.252 2013/02/04 13:37:30 macallan Exp $"); #ifdef PMAP_DEBUG @@ -2862,7 +2862,10 @@ pmap_enter(pmap_t pm, vaddr_t va, paddr_ npte |= L2_TYPE_INV; } - npte |= pte_l2_s_cache_mode; + if (flags & ARM32_MMAP_WRITECOMBINE) { + npte |= pte_l2_s_wc_mode; + } else + npte |= pte_l2_s_cache_mode; if (pg == opg) { /*