From owner-p4-projects@FreeBSD.ORG  Tue Jul 12 21:25:05 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7925916A420; Tue, 12 Jul 2005 21:25:04 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 4C2F716A41C
	for <perforce@freebsd.org>; Tue, 12 Jul 2005 21:25:04 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 184C943D49
	for <perforce@freebsd.org>; Tue, 12 Jul 2005 21:25:04 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j6CLP33S095855
	for <perforce@freebsd.org>; Tue, 12 Jul 2005 21:25:03 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6CLP3AX095852
	for perforce@freebsd.org; Tue, 12 Jul 2005 21:25:03 GMT
	(envelope-from peter@freebsd.org)
Date: Tue, 12 Jul 2005 21:25:03 GMT
Message-Id: <200507122125.j6CLP3AX095852@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 80052 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 12 Jul 2005 21:25:05 -0000

http://perforce.freebsd.org/chv.cgi?CH=80052

Change 80052 by peter@peter_melody on 2005/07/12 21:24:46

	oops, use tlb coherent mappings.

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/uio_machdep.c#6 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/uio_machdep.c#6 (text+ko) ====

@@ -95,7 +95,7 @@
 		page_offset = offset & PAGE_MASK;
 		cnt = min(cnt, PAGE_SIZE - page_offset);
 #ifdef NODMAP
-		pmap_kenter(kva, VM_PAGE_TO_PHYS(ma[offset >> PAGE_SHIFT]));
+		pmap_qenter(kva, &ma[offset >> PAGE_SHIFT], 1);
 		cp = (char *)kva + page_offset;
 #else
 		cp = (char *)PHYS_TO_DMAP(ma[offset >> PAGE_SHIFT]->phys_addr) +
@@ -122,7 +122,7 @@
 			break;
 		}
 #ifdef NODMAP
-		pmap_kremove(kva);
+		pmap_qremove(kva, 1);
 #endif
 		iov->iov_base = (char *)iov->iov_base + cnt;
 		iov->iov_len -= cnt;