Oops; vm_offset_t -> vaddr_t.

This commit is contained in:
mycroft 1999-03-27 00:30:06 +00:00
parent 6a6b1bb99f
commit 12d512bbb7
12 changed files with 28 additions and 26 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: mem.c,v 1.14 1999/03/26 23:41:28 mycroft Exp $ */
/* $NetBSD: mem.c,v 1.15 1999/03/27 00:30:06 mycroft Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -145,7 +145,7 @@ mmrw(dev, uio, flags)
prot = uio->uio_rw == UIO_READ ? VM_PROT_READ :
VM_PROT_WRITE;
pmap_enter(pmap_kernel(), (vm_offset_t)vmmap,
pmap_enter(pmap_kernel(), (vaddr_t)vmmap,
trunc_page(v), prot, TRUE, prot);
o = uio->uio_offset & PGOFSET;
c = min(uio->uio_resid, (int)(NBPG - o));

View File

@ -1,4 +1,4 @@
/* $NetBSD: mem.c,v 1.24 1999/03/26 23:41:29 mycroft Exp $ */
/* $NetBSD: mem.c,v 1.25 1999/03/27 00:30:06 mycroft Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -137,7 +137,7 @@ mmrw(dev, uio, flags)
prot = uio->uio_rw == UIO_READ ? VM_PROT_READ :
VM_PROT_WRITE;
pmap_enter(pmap_kernel(), (vm_offset_t)vmmap,
pmap_enter(pmap_kernel(), (vaddr_t)vmmap,
trunc_page(v), prot, TRUE, prot);
o = uio->uio_offset & PGOFSET;
c = min(uio->uio_resid, (int)(NBPG - o));

View File

@ -1,4 +1,4 @@
/* $NetBSD: mem.c,v 1.40 1999/03/26 23:41:30 mycroft Exp $ */
/* $NetBSD: mem.c,v 1.41 1999/03/27 00:30:07 mycroft Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -143,7 +143,7 @@ mmrw(dev, uio, flags)
v = uio->uio_offset;
prot = uio->uio_rw == UIO_READ ? VM_PROT_READ :
VM_PROT_WRITE;
pmap_enter(pmap_kernel(), (vm_offset_t)vmmap,
pmap_enter(pmap_kernel(), (vaddr_t)vmmap,
trunc_page(v), prot, TRUE, prot);
o = uio->uio_offset & PGOFSET;
c = min(uio->uio_resid, (int)(NBPG - o));

View File

@ -1,4 +1,4 @@
/* $NetBSD: mem.c,v 1.21 1999/03/26 23:41:30 mycroft Exp $ */
/* $NetBSD: mem.c,v 1.22 1999/03/27 00:30:07 mycroft Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -137,7 +137,7 @@ mmrw(dev, uio, flags)
prot = uio->uio_rw == UIO_READ ? VM_PROT_READ :
VM_PROT_WRITE;
pmap_enter(pmap_kernel(), (vm_offset_t)vmmap,
pmap_enter(pmap_kernel(), (vaddr_t)vmmap,
trunc_page(v), prot, TRUE, prot);
o = uio->uio_offset & PGOFSET;
c = min(uio->uio_resid, (int)(NBPG - o));

View File

@ -1,4 +1,4 @@
/* $NetBSD: mem.c,v 1.9 1999/03/26 23:41:31 mycroft Exp $ */
/* $NetBSD: mem.c,v 1.10 1999/03/27 00:30:07 mycroft Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -129,7 +129,7 @@ mmrw(dev, uio, flags)
#endif
prot = uio->uio_rw == UIO_READ ? VM_PROT_READ :
VM_PROT_WRITE;
pmap_enter(pmap_kernel(), (vm_offset_t)vmmap,
pmap_enter(pmap_kernel(), (vaddr_t)vmmap,
trunc_page(v), prot, TRUE, prot);
o = uio->uio_offset & PGOFSET;
c = min(uio->uio_resid, (int)(NBPG - o));

View File

@ -1,4 +1,4 @@
/* $NetBSD: mem.c,v 1.7 1999/03/26 23:41:32 mycroft Exp $ */
/* $NetBSD: mem.c,v 1.8 1999/03/27 00:30:07 mycroft Exp $ */
/*
* This file was taken from mvme68k/mvme68k/mem.c
@ -136,7 +136,7 @@ mmrw(dev, uio, flags)
#endif
prot = uio->uio_rw == UIO_READ ? VM_PROT_READ :
VM_PROT_WRITE;
pmap_enter(pmap_kernel(), (vm_offset_t)vmmap,
pmap_enter(pmap_kernel(), (vaddr_t)vmmap,
trunc_page(v), prot, TRUE, prot);
o = uio->uio_offset & PGOFSET;
c = min(uio->uio_resid, (int)(NBPG - o));

View File

@ -1,4 +1,4 @@
/* $NetBSD: mem.c,v 1.21 1999/03/26 23:41:33 mycroft Exp $ */
/* $NetBSD: mem.c,v 1.22 1999/03/27 00:30:07 mycroft Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -125,7 +125,7 @@ mmrw(dev, uio, flags)
v = uio->uio_offset;
prot = uio->uio_rw == UIO_READ ? VM_PROT_READ :
VM_PROT_WRITE;
pmap_enter(pmap_kernel(), (vm_offset_t)vmmap,
pmap_enter(pmap_kernel(), (vaddr_t)vmmap,
trunc_page(v), prot, TRUE, prot);
o = uio->uio_offset & PGOFSET;
c = min(uio->uio_resid, (int)(NBPG - o));

View File

@ -1,4 +1,4 @@
/* $NetBSD: mem.c,v 1.19 1999/03/26 23:41:35 mycroft Exp $ */
/* $NetBSD: mem.c,v 1.20 1999/03/27 00:30:07 mycroft Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -131,7 +131,7 @@ mmrw(dev, uio, flags)
}
prot = uio->uio_rw == UIO_READ ? VM_PROT_READ :
VM_PROT_WRITE;
pmap_enter(pmap_kernel(), (vm_offset_t)vmmap,
pmap_enter(pmap_kernel(), (vaddr_t)vmmap,
trunc_page(v), prot, TRUE, prot);
o = uio->uio_offset & PGOFSET;
c = min(uio->uio_resid, (int)(NBPG - o));

View File

@ -1,4 +1,4 @@
/* $NetBSD: mem.c,v 1.7 1999/03/26 23:41:36 mycroft Exp $ */
/* $NetBSD: mem.c,v 1.8 1999/03/27 00:30:07 mycroft Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -132,7 +132,7 @@ mmrw(dev, uio, flags)
}
prot = uio->uio_rw == UIO_READ ? VM_PROT_READ :
VM_PROT_WRITE;
pmap_enter(pmap_kernel(), (vm_offset_t)vmmap,
pmap_enter(pmap_kernel(), (vaddr_t)vmmap,
trunc_page(v), prot, TRUE, prot);
o = uio->uio_offset & PGOFSET;
c = min(uio->uio_resid, (int)(NBPG - o));

View File

@ -1,4 +1,4 @@
/* $NetBSD: mem.c,v 1.31 1999/03/26 23:41:37 mycroft Exp $ */
/* $NetBSD: mem.c,v 1.32 1999/03/27 00:30:07 mycroft Exp $ */
/*
* Copyright (c) 1994, 1995 Gordon W. Ross
@ -161,12 +161,13 @@ mmrw(dev, uio, flags)
/* Temporarily map the memory at vmmap. */
prot = uio->uio_rw == UIO_READ ? VM_PROT_READ :
VM_PROT_WRITE;
pmap_enter(pmap_kernel(), (vm_offset_t)vmmap,
pmap_enter(pmap_kernel(), (vaddr_t)vmmap,
trunc_page(v), prot, TRUE, prot);
o = v & PGOFSET;
c = min(uio->uio_resid, (int)(NBPG - o));
error = uiomove((caddr_t)vmmap + o, c, uio);
pmap_remove(pmap_kernel(), vmmap, vmmap + NBPG);
pmap_remove(pmap_kernel(), (vaddr_t)vmmap,
(vaddr_t)vmmap + NBPG);
break;
case 1: /* /dev/kmem */

View File

@ -1,4 +1,4 @@
/* $NetBSD: mem.c,v 1.12 1999/03/26 23:41:37 mycroft Exp $ */
/* $NetBSD: mem.c,v 1.13 1999/03/27 00:30:08 mycroft Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -156,12 +156,13 @@ mmrw(dev, uio, flags)
/* Temporarily map the memory at vmmap. */
prot = uio->uio_rw == UIO_READ ? VM_PROT_READ :
VM_PROT_WRITE;
pmap_enter(pmap_kernel(), (vm_offset_t)vmmap,
pmap_enter(pmap_kernel(), (vaddr_t)vmmap,
trunc_page(v), prot, TRUE, prot);
o = v & PGOFSET;
c = min(uio->uio_resid, (int)(NBPG - o));
error = uiomove((caddr_t)vmmap + o, c, uio);
pmap_remove(pmap_kernel(), vmmap, vmmap + NBPG);
pmap_remove(pmap_kernel(), (vaddr_t)vmmap,
(vaddr_t)vmmap + NBPG);
break;
case 1: /* /dev/kmem */

View File

@ -1,4 +1,4 @@
/* $NetBSD: mem.c,v 1.14 1999/03/26 23:41:38 mycroft Exp $ */
/* $NetBSD: mem.c,v 1.15 1999/03/27 00:30:08 mycroft Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -134,7 +134,7 @@ mmrw(dev, uio, flags)
#endif
prot = uio->uio_rw == UIO_READ ? VM_PROT_READ :
VM_PROT_WRITE;
pmap_enter(pmap_kernel(), (vm_offset_t)vmmap,
pmap_enter(pmap_kernel(), (vaddr_t)vmmap,
trunc_page(v), prot, TRUE, prot);
o = uio->uio_offset & PGOFSET;
c = min(uio->uio_resid, (int)(NBPG - o));