Module Name: src
Committed By: matt
Date: Tue Oct 23 22:50:00 UTC 2012
Modified Files:
src/sys/arch/arm/arm32: vm_machdep.c
Log Message:
When allocating the kernel virtual addresses, make sure to match the
color of the user addresses.
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/arm/arm32/vm_machdep.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/vm_machdep.c
diff -u src/sys/arch/arm/arm32/vm_machdep.c:1.60 src/sys/arch/arm/arm32/vm_machdep.c:1.61
--- src/sys/arch/arm/arm32/vm_machdep.c:1.60 Wed Aug 29 07:09:12 2012
+++ src/sys/arch/arm/arm32/vm_machdep.c Tue Oct 23 22:50:00 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.60 2012/08/29 07:09:12 matt Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.61 2012/10/23 22:50:00 matt Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.60 2012/08/29 07:09:12 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.61 2012/10/23 22:50:00 matt Exp $");
#include "opt_armfpe.h"
#include "opt_pmap_debug.h"
@@ -251,7 +251,8 @@ vmapbuf(struct buf *bp, vsize_t len)
faddr = trunc_page((vaddr_t)bp->b_data);
off = (vaddr_t)bp->b_data - faddr;
len = round_page(off + len);
- taddr = uvm_km_alloc(phys_map, len, 0, UVM_KMF_VAONLY | UVM_KMF_WAITVA);
+ taddr = uvm_km_alloc(phys_map, len, atop(faddr) & uvmexp.colormask,
+ UVM_KMF_VAONLY | UVM_KMF_WAITVA | UVM_KMF_COLORMATCH);
bp->b_data = (void *)(taddr + off);
/*
