From owner-p4-projects@FreeBSD.ORG  Thu Jul 21 21:47:54 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 6C4E416A421; Thu, 21 Jul 2005 21:47:54 +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 2E69316A41F
	for <perforce@freebsd.org>; Thu, 21 Jul 2005 21:47:54 +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 F3A9243D48
	for <perforce@freebsd.org>; Thu, 21 Jul 2005 21:47:53 +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 j6LLlrNY027264
	for <perforce@freebsd.org>; Thu, 21 Jul 2005 21:47:53 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j6LLlr20027261
	for perforce@freebsd.org; Thu, 21 Jul 2005 21:47:53 GMT
	(envelope-from peter@freebsd.org)
Date: Thu, 21 Jul 2005 21:47:53 GMT
Message-Id: <200507212147.j6LLlr20027261@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 80708 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: Thu, 21 Jul 2005 21:47:55 -0000

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

Change 80708 by peter@peter_daintree on 2005/07/21 21:47:49

	Remove the temporary hack that used direct maps instead of
	temporary ephemeral mappings.

Affected files ...

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

Differences ...

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

@@ -48,10 +48,6 @@
 
 #include <vm/vm.h>
 #include <vm/vm_page.h>
-#ifdef NODMAP
-#include <vm/vm_extern.h>
-#include <vm/vm_kern.h>
-#endif
 
 #include <machine/vmparam.h>
 
@@ -69,17 +65,11 @@
 	size_t cnt;
 	int error = 0;
 	int save = 0;
-#ifdef NODMAP
-	vm_offset_t kva;
-#endif
 
 	KASSERT(uio->uio_rw == UIO_READ || uio->uio_rw == UIO_WRITE,
 	    ("uiomove_fromphys: mode"));
 	KASSERT(uio->uio_segflg != UIO_USERSPACE || uio->uio_td == curthread,
 	    ("uiomove_fromphys proc"));
-#ifdef NODMAP
-	kva = kmem_alloc_nofault(kernel_map, PAGE_SIZE);
-#endif
 	save = td->td_pflags & TDP_DEADLKTREAT;
 	td->td_pflags |= TDP_DEADLKTREAT;
 	while (n > 0 && uio->uio_resid) {
@@ -94,13 +84,8 @@
 			cnt = n;
 		page_offset = offset & PAGE_MASK;
 		cnt = min(cnt, PAGE_SIZE - page_offset);
-#ifdef NODMAP
-		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) +
 		    page_offset;
-#endif
 		switch (uio->uio_segflg) {
 		case UIO_USERSPACE:
 			if (ticks - PCPU_GET(switchticks) >= hogticks)
@@ -131,9 +116,5 @@
 out:
 	if (save == 0)
 		td->td_pflags &= ~TDP_DEADLKTREAT;
-#ifdef NODMAP
-	pmap_qremove(kva, 1);
-	kmem_free(kernel_map, kva, PAGE_SIZE);
-#endif
 	return (error);
 }