things [in pmap] have changed, kundun

1 files changed, 6 insertions, 55 deletions

diff --git a/sys/arch/hppa/dev/mem.c b/sys/arch/hppa/dev/mem.c
index e722db12820..a4af1cd7453 100644
--- a/sys/arch/hppa/dev/mem.c
+++ b/sys/arch/hppa/dev/mem.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mem.c,v 1.13 2002/06/06 16:32:33 mickey Exp $	*/
+/*	$OpenBSD: mem.c,v 1.14 2002/09/05 21:36:28 mickey Exp $	*/
 
 /*
  * Copyright (c) 1998-2002 Michael Shalayeff
@@ -117,9 +117,6 @@ struct cfdriver mem_cd = {
 	NULL, "mem", DV_DULL
 };
 
-/* A lock for the vmmap, 16-byte aligned as PA-RISC semaphores must be. */
-static volatile int32_t vmmap_lock __attribute__ ((aligned (32))) = 1;
-extern char *vmmap;
 caddr_t zeropage;
 
 int
@@ -239,11 +236,8 @@ mmrw(dev, uio, flags)
 	int flags;
 {
 	extern u_int totalphysmem;
-	extern vaddr_t virtual_avail;
 	struct iovec	*iov;
-	int32_t lockheld = 0;
 	vaddr_t	v, o;
-	vm_prot_t prot;
 	int rw, error = 0;
 	u_int	c;
 
@@ -267,48 +261,13 @@ mmrw(dev, uio, flags)
 				/* this will break us out of the loop */
 				continue;
 			}
-
-			/*
-			 * If the address is inside our large
-			 * directly-mapped kernel BTLB entry,
-			 * use kmem instead.
-			 */
-			if (v < virtual_avail)
-				goto use_kmem;
-
-			/*
-			 * If we don't already hold the vmmap lock,
-			 * acquire it.
-			 */
-			while (!lockheld) {
-				__asm __volatile("ldcws 0(%1), %0\n\tsync"
-				    : "=r" (lockheld) : "r" (&vmmap_lock));
-				if (lockheld)
-					break;
-				error = tsleep((caddr_t)&vmmap_lock,
-				    PZERO | PCATCH,
-				    "mmrw", 0);
-				if (error)
-					return (error);
-			}
-
-			/* Temporarily map the memory at vmmap. */
-			prot = uio->uio_rw == UIO_READ ? VM_PROT_READ :
-			    VM_PROT_WRITE;
-			pmap_enter(pmap_kernel(), (vaddr_t)vmmap,
-			    trunc_page(v), prot, prot|PMAP_WIRED);
-			pmap_update(pmap_kernel());
-			o = v & PGOFSET;
-			c = min(uio->uio_resid, (int)(PAGE_SIZE - o));
-			error = uiomove((caddr_t)vmmap + o, c, uio);
-			pmap_remove(pmap_kernel(), (vaddr_t)vmmap,
-			    (vaddr_t)vmmap + PAGE_SIZE);
-			pmap_update(pmap_kernel());
+			c = ctob(totalphysmem) - v;
+			c = min(c, uio->uio_resid);
+			error = uiomove((caddr_t)v, c, uio);
 			break;
 
 		case 1:				/*  /dev/kmem  */
 			v = uio->uio_offset;
-use_kmem:
 			o = v & PGOFSET;
 			c = min(uio->uio_resid, (int)(PAGE_SIZE - o));
 			rw = (uio->uio_rw == UIO_READ) ? B_READ : B_WRITE;
@@ -336,9 +295,8 @@ use_kmem:
 			 * of memory for use with /dev/zero.
 			 */
 			if (zeropage == NULL) {
-				zeropage = (caddr_t)
-				    malloc(PAGE_SIZE, M_TEMP, M_WAITOK);
-				memset(zeropage, 0, PAGE_SIZE);
+				zeropage = malloc(PAGE_SIZE, M_TEMP, M_WAITOK);
+				bzero(zeropage, PAGE_SIZE);
 			}
 			c = min(iov->iov_len, PAGE_SIZE);
 			error = uiomove(zeropage, c, uio);
@@ -349,13 +307,6 @@ use_kmem:
 		}
 	}
 
-	/* If we hold the vmmap lock, release it. */
-	if (lockheld) {
-		__asm __volatile("sync\n\tstw	%1, 0(%0)"
-		    :: "r" (&vmmap_lock), "r" (1));
-		wakeup((caddr_t)&vmmap_lock);
-	}
-
 	return (error);
 }