Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch Oops; vm_offset_t -> vaddr_t.
details: https://anonhg.NetBSD.org/src/rev/f0bfd8b69bdf
branches: trunk
changeset: 467657:f0bfd8b69bdf
user: mycroft <mycroft%NetBSD.org@localhost>
date: Sat Mar 27 00:30:06 1999 +0000
description:
Oops; vm_offset_t -> vaddr_t.
diffstat:
sys/arch/atari/atari/mem.c | 4 ++--
sys/arch/hp300/hp300/mem.c | 4 ++--
sys/arch/i386/i386/mem.c | 4 ++--
sys/arch/mac68k/mac68k/mem.c | 4 ++--
sys/arch/mvme68k/mvme68k/mem.c | 4 ++--
sys/arch/next68k/next68k/mem.c | 4 ++--
sys/arch/pc532/pc532/mem.c | 4 ++--
sys/arch/sparc/sparc/mem.c | 4 ++--
sys/arch/sparc64/sparc64/mem.c | 4 ++--
sys/arch/sun3/sun3/mem.c | 7 ++++---
sys/arch/sun3/sun3x/mem.c | 7 ++++---
sys/arch/x68k/x68k/mem.c | 4 ++--
12 files changed, 28 insertions(+), 26 deletions(-)
diffs (230 lines):
diff -r d272d4e4cd9c -r f0bfd8b69bdf sys/arch/atari/atari/mem.c
--- a/sys/arch/atari/atari/mem.c Sat Mar 27 00:10:47 1999 +0000
+++ b/sys/arch/atari/atari/mem.c Sat Mar 27 00:30:06 1999 +0000
@@ -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 @@
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));
diff -r d272d4e4cd9c -r f0bfd8b69bdf sys/arch/hp300/hp300/mem.c
--- a/sys/arch/hp300/hp300/mem.c Sat Mar 27 00:10:47 1999 +0000
+++ b/sys/arch/hp300/hp300/mem.c Sat Mar 27 00:30:06 1999 +0000
@@ -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 @@
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));
diff -r d272d4e4cd9c -r f0bfd8b69bdf sys/arch/i386/i386/mem.c
--- a/sys/arch/i386/i386/mem.c Sat Mar 27 00:10:47 1999 +0000
+++ b/sys/arch/i386/i386/mem.c Sat Mar 27 00:30:06 1999 +0000
@@ -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 @@
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));
diff -r d272d4e4cd9c -r f0bfd8b69bdf sys/arch/mac68k/mac68k/mem.c
--- a/sys/arch/mac68k/mac68k/mem.c Sat Mar 27 00:10:47 1999 +0000
+++ b/sys/arch/mac68k/mac68k/mem.c Sat Mar 27 00:30:06 1999 +0000
@@ -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 @@
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));
diff -r d272d4e4cd9c -r f0bfd8b69bdf sys/arch/mvme68k/mvme68k/mem.c
--- a/sys/arch/mvme68k/mvme68k/mem.c Sat Mar 27 00:10:47 1999 +0000
+++ b/sys/arch/mvme68k/mvme68k/mem.c Sat Mar 27 00:30:06 1999 +0000
@@ -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 @@
#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));
diff -r d272d4e4cd9c -r f0bfd8b69bdf sys/arch/next68k/next68k/mem.c
--- a/sys/arch/next68k/next68k/mem.c Sat Mar 27 00:10:47 1999 +0000
+++ b/sys/arch/next68k/next68k/mem.c Sat Mar 27 00:30:06 1999 +0000
@@ -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 @@
#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));
diff -r d272d4e4cd9c -r f0bfd8b69bdf sys/arch/pc532/pc532/mem.c
--- a/sys/arch/pc532/pc532/mem.c Sat Mar 27 00:10:47 1999 +0000
+++ b/sys/arch/pc532/pc532/mem.c Sat Mar 27 00:30:06 1999 +0000
@@ -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 @@
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));
diff -r d272d4e4cd9c -r f0bfd8b69bdf sys/arch/sparc/sparc/mem.c
--- a/sys/arch/sparc/sparc/mem.c Sat Mar 27 00:10:47 1999 +0000
+++ b/sys/arch/sparc/sparc/mem.c Sat Mar 27 00:30:06 1999 +0000
@@ -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 @@
}
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));
diff -r d272d4e4cd9c -r f0bfd8b69bdf sys/arch/sparc64/sparc64/mem.c
--- a/sys/arch/sparc64/sparc64/mem.c Sat Mar 27 00:10:47 1999 +0000
+++ b/sys/arch/sparc64/sparc64/mem.c Sat Mar 27 00:30:06 1999 +0000
@@ -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 @@
}
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));
diff -r d272d4e4cd9c -r f0bfd8b69bdf sys/arch/sun3/sun3/mem.c
--- a/sys/arch/sun3/sun3/mem.c Sat Mar 27 00:10:47 1999 +0000
+++ b/sys/arch/sun3/sun3/mem.c Sat Mar 27 00:30:06 1999 +0000
@@ -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 @@
/* 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 */
diff -r d272d4e4cd9c -r f0bfd8b69bdf sys/arch/sun3/sun3x/mem.c
--- a/sys/arch/sun3/sun3x/mem.c Sat Mar 27 00:10:47 1999 +0000
+++ b/sys/arch/sun3/sun3x/mem.c Sat Mar 27 00:30:06 1999 +0000
@@ -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 @@
/* 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 */
diff -r d272d4e4cd9c -r f0bfd8b69bdf sys/arch/x68k/x68k/mem.c
--- a/sys/arch/x68k/x68k/mem.c Sat Mar 27 00:10:47 1999 +0000
+++ b/sys/arch/x68k/x68k/mem.c Sat Mar 27 00:30:06 1999 +0000
@@ -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 @@
#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));
Home |
Main Index |
Thread Index |
Old Index