diff options
| author | Artur Grabowski <art@cvs.openbsd.org> | 2001-06-27 04:49:49 +0000 |
|---|---|---|
| committer | Artur Grabowski <art@cvs.openbsd.org> | 2001-06-27 04:49:49 +0000 |
| commit | b61e35faf27549918f1230cc2ce84736dd843937 (patch) | |
| tree | 30c8c327ade6c3964b6174515a7d4ac49fb5d480 /sys/kern/kern_sysctl.c | |
| parent | edcf27d64733b7c58c5e752241e2f00119bdc747 (diff) | |
remove old vm
Diffstat (limited to 'sys/kern/kern_sysctl.c')
| -rw-r--r-- | sys/kern/kern_sysctl.c | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index 3c026c2b7bc..be8b7cebd91 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_sysctl.c,v 1.51 2001/06/24 16:00:47 art Exp $ */ +/* $OpenBSD: kern_sysctl.c,v 1.52 2001/06/27 04:49:46 art Exp $ */ /* $NetBSD: kern_sysctl.c,v 1.17 1996/05/20 17:49:05 mrg Exp $ */ /*- @@ -64,9 +64,7 @@ #include <sys/vmmeter.h> #include <sys/namei.h> -#if defined(UVM) #include <uvm/uvm_extern.h> -#endif #include <sys/mount.h> #include <sys/syscallargs.h> @@ -147,11 +145,7 @@ sys___sysctl(p, v, retval) fn = hw_sysctl; break; case CTL_VM: -#if defined(UVM) fn = uvm_sysctl; -#else - fn = vm_sysctl; -#endif break; case CTL_NET: fn = net_sysctl; @@ -183,36 +177,24 @@ sys___sysctl(p, v, retval) (error = copyin(SCARG(uap, oldlenp), &oldlen, sizeof(oldlen)))) return (error); if (SCARG(uap, old) != NULL) { -#if defined(UVM) /* XXX - obsolete now that vslock returns an error? */ if (!uvm_useracc(SCARG(uap, old), oldlen, B_WRITE)) -#else - if (!useracc(SCARG(uap, old), oldlen, B_WRITE)) -#endif return (EFAULT); if ((error = lockmgr(&sysctl_lock, LK_EXCLUSIVE, NULL, p)) != 0) return (error); if (dolock) -#if defined(UVM) if (uvm_vslock(p, SCARG(uap, old), oldlen, VM_PROT_READ|VM_PROT_WRITE) != KERN_SUCCESS) { lockmgr(&sysctl_lock, LK_RELEASE, NULL, p); return EFAULT; } -#else - vslock(SCARG(uap, old), oldlen); -#endif savelen = oldlen; } error = (*fn)(name + 1, SCARG(uap, namelen) - 1, SCARG(uap, old), &oldlen, SCARG(uap, new), SCARG(uap, newlen), p); if (SCARG(uap, old) != NULL) { if (dolock) -#if defined(UVM) uvm_vsunlock(p, SCARG(uap, old), savelen); -#else - vsunlock(SCARG(uap, old), savelen); -#endif lockmgr(&sysctl_lock, LK_RELEASE, NULL, p); } if (error) @@ -453,13 +435,8 @@ hw_sysctl(name, namelen, oldp, oldlenp, newp, newlen, p) case HW_PHYSMEM: return (sysctl_rdint(oldp, oldlenp, newp, ctob(physmem))); case HW_USERMEM: -#if defined(UVM) return (sysctl_rdint(oldp, oldlenp, newp, ctob(physmem - uvmexp.wired))); -#else - return (sysctl_rdint(oldp, oldlenp, newp, - ctob(physmem - cnt.v_wire_count))); -#endif case HW_PAGESIZE: return (sysctl_rdint(oldp, oldlenp, newp, PAGE_SIZE)); case HW_DISKNAMES: |