Do not perform cache operations in vmapbuf(), pmap is supposed to do them

for us if needed.

ok art@ kettenis@

3 files changed, 3 insertions, 22 deletions

diff --git a/sys/arch/hppa/hppa/vm_machdep.c b/sys/arch/hppa/hppa/vm_machdep.c
index 78ab03bb2a3..ad8ce7fcd45 100644
--- a/sys/arch/hppa/hppa/vm_machdep.c
+++ b/sys/arch/hppa/hppa/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm_machdep.c,v 1.63 2008/07/14 13:37:39 miod Exp $	*/
+/*	$OpenBSD: vm_machdep.c,v 1.64 2008/09/30 18:54:26 miod Exp $	*/
 
 /*
  * Copyright (c) 1999-2004 Michael Shalayeff
@@ -218,13 +218,7 @@ vmapbuf(bp, len)
 	off = (vaddr_t)bp->b_data - uva;
 	size = round_page(off + len);
 
-	/*
-	 * We do it on our own here to be able to specify an offset to uvm_map
-	 * so that we can get all benefits of PMAP_PREFER.
-	 * - art@
-	 */
 	kva = uvm_km_valloc_prefer_wait(phys_map, size, uva);
-	fdcache(pm->pm_space, uva, size);
 	bp->b_data = (caddr_t)(kva + off);
 	while (size > 0) {
 		paddr_t pa;
diff --git a/sys/arch/hppa64/hppa64/vm_machdep.c b/sys/arch/hppa64/hppa64/vm_machdep.c
index cd835c5c3c7..f5d8ab97727 100644
--- a/sys/arch/hppa64/hppa64/vm_machdep.c
+++ b/sys/arch/hppa64/hppa64/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm_machdep.c,v 1.8 2008/04/20 17:11:24 kettenis Exp $	*/
+/*	$OpenBSD: vm_machdep.c,v 1.9 2008/09/30 18:54:27 miod Exp $	*/
 
 /*
  * Copyright (c) 2005 Michael Shalayeff
@@ -212,13 +212,7 @@ vmapbuf(bp, len)
 	off = (vaddr_t)bp->b_data - uva;
 	size = round_page(off + len);
 
-	/*
-	 * We do it on our own here to be able to specify an offset to uvm_map
-	 * so that we can get all benefits of PMAP_PREFER.
-	 * - art@
-	 */
 	kva = uvm_km_valloc_prefer_wait(phys_map, size, uva);
-	fdcache(pm->pm_space, uva, size);
 	bp->b_data = (caddr_t)(kva + off);
 	while (size > 0) {
 		paddr_t pa;
diff --git a/sys/arch/sparc64/sparc64/vm_machdep.c b/sys/arch/sparc64/sparc64/vm_machdep.c
index bac9a8a6816..54941ea07db 100644
--- a/sys/arch/sparc64/sparc64/vm_machdep.c
+++ b/sys/arch/sparc64/sparc64/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm_machdep.c,v 1.25 2008/07/14 14:00:01 miod Exp $	*/
+/*	$OpenBSD: vm_machdep.c,v 1.26 2008/09/30 18:54:29 miod Exp $	*/
 /*	$NetBSD: vm_machdep.c,v 1.38 2001/06/30 00:02:20 eeh Exp $ */
 
 /*
@@ -99,13 +99,6 @@ vmapbuf(bp, len)
 	kva = uvm_km_valloc_prefer_wait(kernel_map, len, uva);
 	bp->b_data = (caddr_t)(kva + off);
 
-	/*
-	 * We have to flush any write-back cache on the
-	 * user-space mappings so our new mappings will
-	 * have the correct contents.
-	 */
-	cache_flush(uva, len);
-
 	upmap = vm_map_pmap(&bp->b_proc->p_vmspace->vm_map);
 	kpmap = vm_map_pmap(kernel_map);
 	do {