summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/kern/exec_subr.c30
-rw-r--r--sys/kern/init_main.c46
-rw-r--r--sys/kern/kern_descrip.c7
-rw-r--r--sys/kern/kern_exec.c39
-rw-r--r--sys/kern/kern_exit.c15
-rw-r--r--sys/kern/kern_fork.c28
-rw-r--r--sys/kern/kern_fthread.c71
-rw-r--r--sys/kern/kern_kthread.c7
-rw-r--r--sys/kern/kern_lkm.c15
-rw-r--r--sys/kern/kern_malloc.c30
-rw-r--r--sys/kern/kern_malloc_debug.c6
-rw-r--r--sys/kern/kern_physio.c44
-rw-r--r--sys/kern/kern_resource.c9
-rw-r--r--sys/kern/kern_sig.c6
-rw-r--r--sys/kern/kern_subr.c10
-rw-r--r--sys/kern/kern_synch.c12
-rw-r--r--sys/kern/kern_sysctl.c25
-rw-r--r--sys/kern/subr_pool.c32
-rw-r--r--sys/kern/subr_prf.c6
-rw-r--r--sys/kern/sys_pipe.c37
-rw-r--r--sys/kern/sys_process.c4
-rw-r--r--sys/kern/sysv_shm.c67
-rw-r--r--sys/kern/uipc_mbuf.c12
-rw-r--r--sys/kern/vfs_subr.c17
-rw-r--r--sys/kern/vfs_syscalls.c17
-rw-r--r--sys/kern/vfs_vnops.c10
26 files changed, 32 insertions, 570 deletions
diff --git a/sys/kern/exec_subr.c b/sys/kern/exec_subr.c
index fcdec7bd2b8..ce252a8cc15 100644
--- a/sys/kern/exec_subr.c
+++ b/sys/kern/exec_subr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exec_subr.c,v 1.11 2001/06/22 14:14:08 deraadt Exp $ */
+/* $OpenBSD: exec_subr.c,v 1.12 2001/06/27 04:49:40 art Exp $ */
/* $NetBSD: exec_subr.c,v 1.9 1994/12/04 03:10:42 mycroft Exp $ */
/*
@@ -43,9 +43,7 @@
#include <vm/vm.h>
-#if defined(UVM)
#include <uvm/uvm.h>
-#endif
#ifdef DEBUG
/*
@@ -148,7 +146,6 @@ vmcmd_map_pagedvn(p, cmd)
* VTEXT. that's handled in the routine which sets up the vmcmd to
* call this routine.
*/
-#if defined(UVM)
struct uvm_object *uobj;
int retval;
@@ -195,11 +192,6 @@ vmcmd_map_pagedvn(p, cmd)
uobj->pgops->pgo_detach(uobj);
return(EINVAL);
-#else
- return vm_mmap(&p->p_vmspace->vm_map, &cmd->ev_addr, cmd->ev_len,
- cmd->ev_prot, VM_PROT_ALL, MAP_FIXED|MAP_COPY, (caddr_t)cmd->ev_vp,
- cmd->ev_offset);
-#endif
}
/*
@@ -215,7 +207,6 @@ vmcmd_map_readvn(p, cmd)
{
int error;
-#if defined(UVM)
if (cmd->ev_len == 0)
return(KERN_SUCCESS); /* XXXCDC: should it happen? */
@@ -226,10 +217,6 @@ vmcmd_map_readvn(p, cmd)
UVM_ADV_NORMAL,
UVM_FLAG_FIXED|UVM_FLAG_OVERLAY|UVM_FLAG_COPYONW));
-#else
- error = vm_allocate(&p->p_vmspace->vm_map, &cmd->ev_addr,
- cmd->ev_len, 0);
-#endif
if (error)
return error;
@@ -239,7 +226,6 @@ vmcmd_map_readvn(p, cmd)
if (error)
return error;
-#if defined(UVM)
if (cmd->ev_prot != (VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE)) {
/*
* we had to map in the area at PROT_ALL so that vn_rdwr()
@@ -254,10 +240,6 @@ vmcmd_map_readvn(p, cmd)
} else {
return(KERN_SUCCESS);
}
-#else
- return vm_map_protect(&p->p_vmspace->vm_map, trunc_page(cmd->ev_addr),
- round_page(cmd->ev_addr + cmd->ev_len), cmd->ev_prot, FALSE);
-#endif
}
/*
@@ -273,7 +255,6 @@ vmcmd_map_zero(p, cmd)
{
int error;
-#if defined(UVM)
if (cmd->ev_len == 0)
return(KERN_SUCCESS); /* XXXCDC: should it happen? */
@@ -283,19 +264,10 @@ vmcmd_map_zero(p, cmd)
UVM_MAPFLAG(cmd->ev_prot, UVM_PROT_ALL, UVM_INH_COPY,
UVM_ADV_NORMAL, UVM_FLAG_FIXED|UVM_FLAG_COPYONW));
-#else
- error = vm_allocate(&p->p_vmspace->vm_map, &cmd->ev_addr,
- cmd->ev_len, 0);
-#endif
if (error)
return error;
-#if !defined(UVM)
- return vm_map_protect(&p->p_vmspace->vm_map, trunc_page(cmd->ev_addr),
- round_page(cmd->ev_addr + cmd->ev_len), cmd->ev_prot, FALSE);
-#else
return(KERN_SUCCESS);
-#endif
}
/*
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index a7f0229cbcd..b1f822ed0cc 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: init_main.c,v 1.68 2001/06/23 18:30:37 deraadt Exp $ */
+/* $OpenBSD: init_main.c,v 1.69 2001/06/27 04:49:40 art Exp $ */
/* $NetBSD: init_main.c,v 1.84.4.1 1996/06/02 09:08:06 mrg Exp $ */
/*
@@ -90,9 +90,7 @@
#include <vm/vm.h>
#include <vm/vm_pageout.h>
-#if defined(UVM)
#include <uvm/uvm.h>
-#endif
#include <net/if.h>
#include <net/raw_cb.h>
@@ -211,15 +209,7 @@ main(framep)
printf(copyright);
printf("\n");
-#if defined(UVM)
uvm_init();
-#else
- vm_mem_init();
- kmeminit();
-#if defined(MACHINE_NEW_NONCONTIG)
- vm_page_physrehash();
-#endif
-#endif /* UVM */
disk_init(); /* must come before autoconfiguration */
tty_init(); /* initialise tty's */
cpu_startup();
@@ -298,28 +288,16 @@ main(framep)
limit0.pl_rlimit[RLIMIT_NOFILE].rlim_max = MIN(NOFILE_MAX,
(maxfiles - NOFILE > NOFILE) ? maxfiles - NOFILE : NOFILE);
limit0.pl_rlimit[RLIMIT_NPROC].rlim_cur = MAXUPRC;
-#if defined(UVM)
i = ptoa(uvmexp.free);
-#else
- i = ptoa(cnt.v_free_count);
-#endif /* UVM */
limit0.pl_rlimit[RLIMIT_RSS].rlim_max = i;
limit0.pl_rlimit[RLIMIT_MEMLOCK].rlim_max = i;
limit0.pl_rlimit[RLIMIT_MEMLOCK].rlim_cur = i / 3;
limit0.p_refcnt = 1;
/* Allocate a prototype map so we have something to fork. */
-#if defined(UVM)
uvmspace_init(&vmspace0, pmap_kernel(), round_page(VM_MIN_ADDRESS),
trunc_page(VM_MAX_ADDRESS), TRUE);
p->p_vmspace = &vmspace0;
-#else
- p->p_vmspace = &vmspace0;
- vmspace0.vm_refcnt = 1;
- vmspace0.vm_map.pmap = pmap_create(0);
- vm_map_init(&p->p_vmspace->vm_map, round_page(VM_MIN_ADDRESS),
- trunc_page(VM_MAX_ADDRESS), TRUE);
-#endif /* UVM */
p->p_addr = proc0paddr; /* XXX */
@@ -337,11 +315,7 @@ main(framep)
rqinit();
/* Configure virtual memory system, set vm rlimits. */
-#if defined(UVM)
uvm_init_limits(p);
-#else
- vm_init_limits(p);
-#endif
/* Initialize the file systems. */
#if defined(NFSSERVER) || defined(NFSCLIENT)
@@ -416,11 +390,7 @@ main(framep)
VOP_UNLOCK(rootvnode, 0, p);
filedesc0.fd_fd.fd_rdir = NULL;
-#if defined(UVM)
uvm_swap_init();
-#else
- swapinit();
-#endif
/*
* Now can look at time, having had a chance to verify the time
@@ -480,11 +450,7 @@ main(framep)
randompid = 1;
/* The scheduler is an infinite loop. */
-#if defined(UVM)
uvm_scheduler();
-#else
- scheduler();
-#endif
/* NOTREACHED */
}
@@ -562,18 +528,12 @@ start_init(arg)
#else
addr = USRSTACK - PAGE_SIZE;
#endif
-#if defined(UVM)
if (uvm_map(&p->p_vmspace->vm_map, &addr, PAGE_SIZE,
NULL, UVM_UNKNOWN_OFFSET,
UVM_MAPFLAG(UVM_PROT_ALL, UVM_PROT_ALL, UVM_INH_COPY,
UVM_ADV_NORMAL, UVM_FLAG_FIXED|UVM_FLAG_OVERLAY|UVM_FLAG_COPYONW))
!= KERN_SUCCESS)
panic("init: couldn't allocate argument space");
-#else
- if (vm_allocate(&p->p_vmspace->vm_map, &addr, (vsize_t)PAGE_SIZE,
- FALSE) != 0)
- panic("init: couldn't allocate argument space");
-#endif
#ifdef MACHINE_STACK_GROWS_UP
p->p_vmspace->vm_maxsaddr = (caddr_t)addr + PAGE_SIZE;
#else
@@ -674,11 +634,7 @@ void
start_pagedaemon(arg)
void *arg;
{
-#if defined(UVM)
uvm_pageout();
-#else
- vm_pageout();
-#endif
/* NOTREACHED */
}
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index 5add00e0b86..6b154784f43 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_descrip.c,v 1.31 2001/06/22 14:14:08 deraadt Exp $ */
+/* $OpenBSD: kern_descrip.c,v 1.32 2001/06/27 04:49:41 art Exp $ */
/* $NetBSD: kern_descrip.c,v 1.42 1996/03/30 22:24:38 christos Exp $ */
/*
@@ -463,15 +463,10 @@ fdrelease(p, fd)
if (fp == NULL)
return (EBADF);
pf = &fdp->fd_ofileflags[fd];
-#if defined(UVM)
if (*pf & UF_MAPPED) {
/* XXX: USELESS? XXXCDC check it */
p->p_fd->fd_ofileflags[fd] &= ~UF_MAPPED;
}
-#else
- if (*pf & UF_MAPPED)
- (void) munmapfd(p, fd);
-#endif
*fpp = NULL;
*pf = 0;
fd_unused(fdp, fd);
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index 2194904adeb..eaa05b0dc75 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_exec.c,v 1.53 2001/06/22 23:55:23 art Exp $ */
+/* $OpenBSD: kern_exec.c,v 1.54 2001/06/27 04:49:41 art Exp $ */
/* $NetBSD: kern_exec.c,v 1.75 1996/02/09 18:59:28 christos Exp $ */
/*-
@@ -61,9 +61,7 @@
#include <vm/vm.h>
#include <vm/vm_kern.h>
-#if defined(UVM)
#include <uvm/uvm_extern.h>
-#endif
#include <machine/cpu.h>
#include <machine/reg.h>
@@ -282,11 +280,7 @@ sys_execve(p, v, retval)
/* XXX -- THE FOLLOWING SECTION NEEDS MAJOR CLEANUP */
/* allocate an argument buffer */
-#if defined(UVM)
argp = (char *) uvm_km_valloc_wait(exec_map, NCARGS);
-#else
- argp = (char *)kmem_alloc_wait(exec_map, NCARGS);
-#endif
#ifdef DIAGNOSTIC
if (argp == (vaddr_t) 0)
panic("execve: argp == NULL");
@@ -380,21 +374,7 @@ sys_execve(p, v, retval)
* Prepare vmspace for remapping. Note that uvmspace_exec can replace
* p_vmspace!
*/
-#if defined(UVM)
uvmspace_exec(p);
-#else
- /* Unmap old program */
-#ifdef __sparc__
- kill_user_windows(p); /* before stack addresses go away */
-#endif
- /* Kill shared memory and unmap old program */
-#ifdef SYSVSHM
- if (vm->vm_shm && vm->vm_refcnt == 1)
- shmexit(vm);
-#endif
- vm_deallocate(&vm->vm_map, VM_MIN_ADDRESS,
- VM_MAXUSER_ADDRESS - VM_MIN_ADDRESS);
-#endif
vm = p->p_vmspace;
/* Now map address space */
@@ -589,11 +569,7 @@ sys_execve(p, v, retval)
splx(s);
}
-#if defined(UVM)
uvm_km_free_wakeup(exec_map, (vaddr_t) argp, NCARGS);
-#else
- kmem_free_wakeup(exec_map, (vaddr_t)argp, NCARGS);
-#endif
FREE(nid.ni_cnd.cn_pnbuf, M_NAMEI);
VOP_CLOSE(pack.ep_vp, FREAD, cred, p);
@@ -639,11 +615,7 @@ bad:
VOP_CLOSE(pack.ep_vp, FREAD, cred, p);
vput(pack.ep_vp);
FREE(nid.ni_cnd.cn_pnbuf, M_NAMEI);
-#if defined(UVM)
uvm_km_free_wakeup(exec_map, (vaddr_t) argp, NCARGS);
-#else
- kmem_free_wakeup(exec_map, (vaddr_t) argp, NCARGS);
-#endif
freehdr:
free(pack.ep_hdr, M_EXEC);
@@ -655,23 +627,14 @@ exec_abort:
* get rid of the (new) address space we have created, if any, get rid
* of our namei data and vnode, and exit noting failure
*/
-#if defined(UVM)
uvm_deallocate(&vm->vm_map, VM_MIN_ADDRESS,
VM_MAXUSER_ADDRESS - VM_MIN_ADDRESS);
-#else
- vm_deallocate(&vm->vm_map, VM_MIN_ADDRESS,
- VM_MAXUSER_ADDRESS - VM_MIN_ADDRESS);
-#endif
if (pack.ep_emul_arg)
FREE(pack.ep_emul_arg, M_TEMP);
FREE(nid.ni_cnd.cn_pnbuf, M_NAMEI);
VOP_CLOSE(pack.ep_vp, FREAD, cred, p);
vput(pack.ep_vp);
-#if defined(UVM)
uvm_km_free_wakeup(exec_map, (vaddr_t) argp, NCARGS);
-#else
- kmem_free_wakeup(exec_map, (vaddr_t) argp, NCARGS);
-#endif
free_pack_abort:
free(pack.ep_hdr, M_EXEC);
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
index b74c64b0357..41fcf9ac857 100644
--- a/sys/kern/kern_exit.c
+++ b/sys/kern/kern_exit.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_exit.c,v 1.32 2001/06/03 08:55:11 angelos Exp $ */
+/* $OpenBSD: kern_exit.c,v 1.33 2001/06/27 04:49:41 art Exp $ */
/* $NetBSD: kern_exit.c,v 1.39 1996/04/22 01:38:25 christos Exp $ */
/*
@@ -80,9 +80,7 @@
#include <vm/vm.h>
#include <vm/vm_kern.h>
-#if defined(UVM)
#include <uvm/uvm_extern.h>
-#endif
void proc_zap __P((struct proc *));
@@ -163,15 +161,9 @@ exit1(p, rv)
* Can't free the entire vmspace as the kernel stack
* may be mapped within that space also.
*/
-#if defined(UVM)
if (vm->vm_refcnt == 1)
(void) uvm_deallocate(&vm->vm_map, VM_MIN_ADDRESS,
VM_MAXUSER_ADDRESS - VM_MIN_ADDRESS);
-#else
- if (vm->vm_refcnt == 1)
- (void) vm_map_remove(&vm->vm_map, VM_MIN_ADDRESS,
- VM_MAXUSER_ADDRESS);
-#endif
if (SESS_LEADER(p)) {
register struct session *sp = p->p_session;
@@ -383,17 +375,12 @@ reaper()
*/
cpu_wait(p);
-#ifdef UVM
/*
* Free the VM resources we're still holding on to.
* We must do this from a valid thread because doing
* so may block.
*/
uvm_exit(p);
-#else
- vmspace_free(p->p_vmspace);
- kmem_free(kernel_map, (vaddr_t)p->p_addr, USPACE);
-#endif
/* Process is now a true zombie. */
if ((p->p_flag & P_NOZOMBIE) == 0) {
diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c
index 094903ef13e..dcd91722897 100644
--- a/sys/kern/kern_fork.c
+++ b/sys/kern/kern_fork.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_fork.c,v 1.39 2001/04/02 21:43:11 niklas Exp $ */
+/* $OpenBSD: kern_fork.c,v 1.40 2001/06/27 04:49:42 art Exp $ */
/* $NetBSD: kern_fork.c,v 1.29 1996/02/09 18:59:34 christos Exp $ */
/*
@@ -64,10 +64,8 @@
#include <vm/vm.h>
#include <vm/vm_kern.h>
-#if defined(UVM)
#include <uvm/uvm_extern.h>
#include <uvm/uvm_map.h>
-#endif
int nprocs = 1; /* process 0 */
int randompid; /* when set to 1, pid's go random */
@@ -168,11 +166,6 @@ fork1(p1, exitsig, flags, stack, stacksize, retval)
return (EAGAIN);
}
-#if !defined(UVM)
- if (flags & FORK_SHAREVM)
- return (EINVAL);
-#endif
-
/*
* Increment the count of procs running with this uid. Don't allow
* a nonprivileged user to exceed their current limit.
@@ -189,11 +182,7 @@ fork1(p1, exitsig, flags, stack, stacksize, retval)
#if defined(arc) || defined(mips_cachealias)
uaddr = kmem_alloc_upage(kernel_map, USPACE);
#else
-#if defined(UVM)
uaddr = uvm_km_valloc(kernel_map, USPACE);
-#else
- uaddr = kmem_alloc_pageable(kernel_map, USPACE);
-#endif
#endif
if (uaddr == 0)
return ENOMEM;
@@ -355,21 +344,12 @@ again:
*/
PHOLD(p1);
-#if defined(UVM)
if (flags & FORK_VMNOSTACK) {
/* share as much address space as possible */
(void) uvm_map_inherit(&p1->p_vmspace->vm_map,
VM_MIN_ADDRESS, VM_MAXUSER_ADDRESS - MAXSSIZ,
VM_INHERIT_SHARE);
}
-#else
- if (flags & FORK_VMNOSTACK) {
- /* share as much address space as possible */
- (void) vm_map_inherit(&p1->p_vmspace->vm_map,
- VM_MIN_ADDRESS, VM_MAXUSER_ADDRESS - MAXSSIZ,
- VM_INHERIT_SHARE);
- }
-#endif
p2->p_addr = (struct user *)uaddr;
@@ -392,12 +372,8 @@ again:
* Finish creating the child process. It will return through a
* different path later.
*/
-#if defined(UVM)
uvm_fork(p1, p2, ((flags & FORK_SHAREVM) ? TRUE : FALSE), stack,
stacksize);
-#else /* UVM */
- vm_fork(p1, p2, stack, stacksize);
-#endif /* UVM */
#endif
vm = p2->p_vmspace;
@@ -430,13 +406,11 @@ again:
*/
PRELE(p1);
-#if defined(UVM)
uvmexp.forks++;
if (flags & FORK_PPWAIT)
uvmexp.forks_ppwait++;
if (flags & FORK_SHAREVM)
uvmexp.forks_sharevm++;
-#endif
/*
* tell any interested parties about the new process
diff --git a/sys/kern/kern_fthread.c b/sys/kern/kern_fthread.c
index 9981eef9ee0..212d4b02a58 100644
--- a/sys/kern/kern_fthread.c
+++ b/sys/kern/kern_fthread.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_fthread.c,v 1.2 2001/05/06 01:23:37 art Exp $ */
+/* $OpenBSD: kern_fthread.c,v 1.3 2001/06/27 04:49:42 art Exp $ */
/* $NetBSD: kern_fthread.c,v 1.3 1998/02/07 16:23:35 chs Exp $ */
/*
@@ -78,32 +78,6 @@
* these routines fake thread handling
*/
-#if !defined(UVM)
-
-void
-assert_wait(event, ruptible)
- void *event;
- boolean_t ruptible;
-{
-#ifdef lint
- ruptible++;
-#endif
- curproc->p_thread = event;
-}
-
-void
-thread_block(msg)
-char *msg;
-{
- int s = splhigh();
-
- if (curproc->p_thread)
- tsleep(curproc->p_thread, PVM, msg, 0);
- splx(s);
-}
-
-#endif
-
void
thread_sleep_msg(event, lock, ruptible, msg, timo)
void *event;
@@ -124,46 +98,3 @@ thread_sleep_msg(event, lock, ruptible, msg, timo)
splx(s);
}
-#if !defined(UVM)
-/*
- * DEBUG stuff
- */
-
-int indent = 0;
-
-/*
- * Note that stdarg.h and the ANSI style va_start macro is used for both
- * ANSI and traditional C compilers. (Same as subr_prf.c does.)
- * XXX: This requires that stdarg.h defines: va_alist, va_dcl
- */
-#include <machine/stdarg.h>
-
-/*ARGSUSED2*/
-void
-#ifdef __STDC__
-iprintf(int (*pr)(const char *, ...), const char *fmt, ...)
-#else
-iprintf(pr, fmt, va_alist)
- void (*pr)();
- const char *fmt;
- va_dcl
-#endif
-{
- register int i;
- va_list ap;
-
- va_start(ap, fmt);
- for (i = indent; i >= 8; i -= 8)
- (*pr)("\t");
- while (--i >= 0)
- (*pr)(" ");
-#ifdef __powerpc__ /* XXX */
- if (pr != printf) /* XXX */
- panic("iprintf"); /* XXX */
- vprintf(fmt, ap); /* XXX */
-#else /* XXX */
- (*pr)("%:", fmt, ap); /* XXX */
-#endif /* __powerpc__ */ /* XXX */
- va_end(ap);
-}
-#endif \ No newline at end of file
diff --git a/sys/kern/kern_kthread.c b/sys/kern/kern_kthread.c
index c81d2f7386e..dc4c8571952 100644
--- a/sys/kern/kern_kthread.c
+++ b/sys/kern/kern_kthread.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_kthread.c,v 1.11 2001/04/02 21:43:12 niklas Exp $ */
+/* $OpenBSD: kern_kthread.c,v 1.12 2001/06/27 04:49:42 art Exp $ */
/* $NetBSD: kern_kthread.c,v 1.3 1998/12/22 21:21:36 kleink Exp $ */
/*-
@@ -83,13 +83,8 @@ kthread_create(func, arg, newpp, fmt, va_alist)
* descriptors and don't leave the exit status around for the
* parent to wait for.
*/
-#ifdef UVM
error = fork1(&proc0, 0,
FORK_SHAREVM|FORK_NOZOMBIE|FORK_SIGHAND, NULL, 0, rv);
-#else
- error = fork1(&proc0, 0,
- FORK_VMNOSTACK|FORK_NOZOMBIE|FORK_SIGHAND, NULL, 0, rv);
-#endif
if (error)
return (error);
diff --git a/sys/kern/kern_lkm.c b/sys/kern/kern_lkm.c
index 27f71b21d9b..dedb7600241 100644
--- a/sys/kern/kern_lkm.c
+++ b/sys/kern/kern_lkm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_lkm.c,v 1.30 2001/05/16 12:52:58 ho Exp $ */
+/* $OpenBSD: kern_lkm.c,v 1.31 2001/06/27 04:49:42 art Exp $ */
/* $NetBSD: kern_lkm.c,v 1.31 1996/03/31 21:40:27 christos Exp $ */
/*
@@ -249,11 +249,7 @@ lkmunreserve()
* Actually unreserve the memory
*/
if (curp && curp->area) {
-#if defined(UVM)
uvm_km_free(kmem_map, curp->area, curp->size);
-#else
- kmem_free(kmem_map, curp->area, curp->size);/**/
-#endif
curp->area = 0;
}
@@ -329,11 +325,7 @@ lkmioctl(dev, cmd, data, flag, p)
*/
curp->size = resrvp->size;
-#if defined(UVM)
curp->area = uvm_km_zalloc(kmem_map, curp->size);
-#else
- curp->area = kmem_alloc(kmem_map, curp->size);/**/
-#endif
curp->offset = 0; /* load offset */
@@ -342,13 +334,8 @@ lkmioctl(dev, cmd, data, flag, p)
if (cmd == LMRESERV && resrvp->sym_size) {
curp->sym_size = resrvp->sym_size;
curp->sym_symsize = resrvp->sym_symsize;
-#if defined(UVM)
curp->syms = (caddr_t)uvm_km_zalloc(kmem_map,
curp->sym_size);
-#else
- curp->syms = (caddr_t)kmem_alloc(kmem_map,
- curp->sym_size);
-#endif
curp->sym_offset = 0;
resrvp->sym_addr = curp->syms; /* ret symbol addr */
} else {
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c
index bb4dda02829..d83bf62722d 100644
--- a/sys/kern/kern_malloc.c
+++ b/sys/kern/kern_malloc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_malloc.c,v 1.34 2001/06/22 14:14:08 deraadt Exp $ */
+/* $OpenBSD: kern_malloc.c,v 1.35 2001/06/27 04:49:43 art Exp $ */
/* $NetBSD: kern_malloc.c,v 1.15.4.2 1996/06/13 17:10:56 cgd Exp $ */
/*
@@ -47,12 +47,10 @@
#include <vm/vm.h>
#include <vm/vm_kern.h>
-#if defined(UVM)
#include <uvm/uvm_extern.h>
static struct vm_map_intrsafe kmem_map_store;
vm_map_t kmem_map = NULL;
-#endif
struct kmembuckets bucket[MINBUCKET + 16];
struct kmemstats kmemstats[M_LAST];
@@ -166,14 +164,9 @@ malloc(size, type, flags)
else
allocsize = 1 << indx;
npg = btoc(allocsize);
-#if defined(UVM)
va = (caddr_t) uvm_km_kmemalloc(kmem_map, uvmexp.kmem_object,
(vsize_t)ctob(npg),
(flags & M_NOWAIT) ? UVM_KMF_NOWAIT : 0);
-#else
- va = (caddr_t) kmem_malloc(kmem_map, (vsize_t)ctob(npg),
- !(flags & M_NOWAIT));
-#endif
if (va == NULL) {
/*
* Kmem_malloc() can return NULL, even if it can
@@ -240,7 +233,6 @@ malloc(size, type, flags)
freep = (struct freelist *)va;
savedtype = (unsigned)freep->type < M_LAST ?
memname[freep->type] : "???";
-#if defined(UVM)
if (kbp->kb_next) {
int rv;
vaddr_t addr = (vaddr_t)kbp->kb_next;
@@ -250,20 +242,13 @@ malloc(size, type, flags)
addr + sizeof(struct freelist), VM_PROT_WRITE);
vm_map_unlock(kmem_map);
- if (!rv)
-#else
- if (kbp->kb_next &&
- !kernacc(kbp->kb_next, sizeof(struct freelist), 0))
-#endif
- {
+ if (!rv) {
printf("%s %d of object %p size %ld %s %s (invalid addr %p)\n",
"Data modified on freelist: word",
(int32_t *)&kbp->kb_next - (int32_t *)kbp, va, size,
"previous type", savedtype, kbp->kb_next);
kbp->kb_next = NULL;
-#if defined(UVM)
}
-#endif
}
/* Fill the fields that we've used with WEIRD_ADDR */
@@ -364,11 +349,7 @@ free(addr, type)
addr, size, memname[type], alloc);
#endif /* DIAGNOSTIC */
if (size > MAXALLOCSAVE) {
-#if defined(UVM)
uvm_km_free(kmem_map, (vaddr_t)addr, ctob(kup->ku_pagecnt));
-#else
- kmem_free(kmem_map, (vaddr_t)addr, ctob(kup->ku_pagecnt));
-#endif
#ifdef KMEMSTATS
size = kup->ku_pagecnt << PGSHIFT;
ksp->ks_memuse -= size;
@@ -451,18 +432,11 @@ kmeminit()
#endif
npg = VM_KMEM_SIZE / PAGE_SIZE;
-#if defined(UVM)
kmemusage = (struct kmemusage *) uvm_km_zalloc(kernel_map,
(vsize_t)(npg * sizeof(struct kmemusage)));
kmem_map = uvm_km_suballoc(kernel_map, (vaddr_t *)&kmembase,
(vaddr_t *)&kmemlimit, (vsize_t)(npg * PAGE_SIZE),
VM_MAP_INTRSAFE, FALSE, &kmem_map_store.vmi_map);
-#else
- kmemusage = (struct kmemusage *) kmem_alloc(kernel_map,
- (vsize_t)(npg * sizeof(struct kmemusage)));
- kmem_map = kmem_suballoc(kernel_map, (vaddr_t *)&kmembase,
- (vaddr_t *)&kmemlimit, (vsize_t)(npg * PAGE_SIZE), FALSE);
-#endif
#ifdef KMEMSTATS
for (indx = 0; indx < MINBUCKET + 16; indx++) {
if (1 << indx >= PAGE_SIZE)
diff --git a/sys/kern/kern_malloc_debug.c b/sys/kern/kern_malloc_debug.c
index 30f06cafbab..42fb53e11b6 100644
--- a/sys/kern/kern_malloc_debug.c
+++ b/sys/kern/kern_malloc_debug.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_malloc_debug.c,v 1.5 2000/06/07 11:21:40 art Exp $ */
+/* $OpenBSD: kern_malloc_debug.c,v 1.6 2001/06/27 04:49:43 art Exp $ */
/*
* Copyright (c) 1999, 2000 Artur Grabowski <art@openbsd.org>
@@ -59,10 +59,6 @@
#include <sys/malloc.h>
#include <sys/systm.h>
-#if !defined(UVM)
-#error MALLOC_DEBUG will not work without UVM.
-#endif
-
#include <vm/vm.h>
#include <vm/vm_kern.h>
#include <uvm/uvm.h>
diff --git a/sys/kern/kern_physio.c b/sys/kern/kern_physio.c
index 9d891a757b3..a684e74201f 100644
--- a/sys/kern/kern_physio.c
+++ b/sys/kern/kern_physio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_physio.c,v 1.12 2001/06/26 06:27:39 aaron Exp $ */
+/* $OpenBSD: kern_physio.c,v 1.13 2001/06/27 04:49:44 art Exp $ */
/* $NetBSD: kern_physio.c,v 1.28 1997/05/19 10:43:28 pk Exp $ */
/*-
@@ -51,9 +51,7 @@
#include <vm/vm.h>
-#if defined(UVM)
#include <uvm/uvm_extern.h>
-#endif
/*
* The routines implemented in this file are described in:
@@ -100,18 +98,11 @@ physio(strategy, bp, dev, flags, minphys, uio)
*/
if (uio->uio_segflg == UIO_USERSPACE)
for (i = 0; i < uio->uio_iovcnt; i++)
-#if defined(UVM) /* XXXCDC: map not locked, rethink */
/* XXX - obsolete now that vslock can error? */
if (!uvm_useracc(uio->uio_iov[i].iov_base,
uio->uio_iov[i].iov_len,
(flags == B_READ) ? B_WRITE : B_READ))
return (EFAULT);
-#else
- if (!useracc(uio->uio_iov[i].iov_base,
- uio->uio_iov[i].iov_len,
- (flags == B_READ) ? B_WRITE : B_READ))
- return (EFAULT);
-#endif
/* Make sure we have a buffer, creating one if necessary. */
if ((nobuf = (bp == NULL)) != 0)
@@ -184,7 +175,6 @@ physio(strategy, bp, dev, flags, minphys, uio)
* restores it.
*/
PHOLD(p);
-#if defined(UVM)
if (uvm_vslock(p, bp->b_data, todo, (flags & B_READ) ?
VM_PROT_READ | VM_PROT_WRITE : VM_PROT_READ) !=
KERN_SUCCESS) {
@@ -192,9 +182,6 @@ physio(strategy, bp, dev, flags, minphys, uio)
bp->b_error = EFAULT;
goto after_unlock;
}
-#else
- vslock(bp->b_data, todo);
-#endif
vmapbuf(bp, todo);
/* [call strategy to start the transfer] */
@@ -225,12 +212,8 @@ physio(strategy, bp, dev, flags, minphys, uio)
* locked]
*/
vunmapbuf(bp, todo);
-#if defined(UVM)
uvm_vsunlock(p, bp->b_data, todo);
after_unlock:
-#else
- vsunlock(bp->b_data, todo);
-#endif
PRELE(p);
/* remember error value (save a splbio/splx pair) */
@@ -297,18 +280,6 @@ struct buf *
getphysbuf()
{
struct buf *bp;
-#if !defined(UVM)
- int s;
-
- s = splbio();
- while (bswlist.b_actf == NULL) {
- bswlist.b_flags |= B_WANTED;
- tsleep((caddr_t)&bswlist, PRIBIO + 1, "getphys", 0);
- }
- bp = bswlist.b_actf;
- bswlist.b_actf = bp->b_actf;
- splx(s);
-#else
bp = malloc(sizeof(*bp), M_TEMP, M_WAITOK);
bzero(bp, sizeof(*bp));
@@ -316,7 +287,7 @@ getphysbuf()
/* XXXCDC: are the following two lines necessary? */
bp->b_rcred = bp->b_wcred = NOCRED;
bp->b_vnbufs.le_next = NOLIST;
-#endif
+
return (bp);
}
@@ -330,16 +301,6 @@ void
putphysbuf(bp)
struct buf *bp;
{
-#if !defined(UVM)
- bp->b_actf = bswlist.b_actf;
- bswlist.b_actf = bp;
- if (bp->b_vp)
- brelvp(bp);
- if (bswlist.b_flags & B_WANTED) {
- bswlist.b_flags &= ~B_WANTED;
- wakeup(&bswlist);
- }
-#else
/* XXXCDC: is this necesary? */
if (bp->b_vp)
brelvp(bp);
@@ -347,7 +308,6 @@ putphysbuf(bp)
if (bp->b_flags & B_WANTED)
panic("putphysbuf: private buf B_WANTED");
free(bp, M_TEMP);
-#endif
}
/*
diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c
index d8fea888001..b800439ab38 100644
--- a/sys/kern/kern_resource.c
+++ b/sys/kern/kern_resource.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_resource.c,v 1.13 2001/05/26 04:10:26 art Exp $ */
+/* $OpenBSD: kern_resource.c,v 1.14 2001/06/27 04:49:44 art Exp $ */
/* $NetBSD: kern_resource.c,v 1.38 1996/10/23 07:19:38 matthias Exp $ */
/*-
@@ -54,9 +54,7 @@
#include <vm/vm.h>
-#if defined(UVM)
#include <uvm/uvm_extern.h>
-#endif
/*
* Resource controls and accounting.
@@ -306,13 +304,8 @@ dosetrlimit(p, which, limp)
}
addr = trunc_page(addr);
size = round_page(size);
-#if defined(UVM)
(void) uvm_map_protect(&p->p_vmspace->vm_map,
addr, addr+size, prot, FALSE);
-#else
- (void) vm_map_protect(&p->p_vmspace->vm_map,
- addr, addr+size, prot, FALSE);
-#endif
}
}
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c
index fa5b19f99c2..22cf62ffc45 100644
--- a/sys/kern/kern_sig.c
+++ b/sys/kern/kern_sig.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_sig.c,v 1.45 2001/06/22 14:14:09 deraadt Exp $ */
+/* $OpenBSD: kern_sig.c,v 1.46 2001/06/27 04:49:44 art Exp $ */
/* $NetBSD: kern_sig.c,v 1.54 1996/04/22 01:38:32 christos Exp $ */
/*
@@ -1351,11 +1351,7 @@ coredump(p)
* vm_coredump() spits out all appropriate segments.
* All that's left to do is to write the core header.
*/
-#if defined(UVM)
error = uvm_coredump(p, vp, cred, &core);
-#else
- error = vm_coredump(p, vp, cred, &core);
-#endif
if (error)
goto out;
error = vn_rdwr(UIO_WRITE, vp, (caddr_t)&core,
diff --git a/sys/kern/kern_subr.c b/sys/kern/kern_subr.c
index 5aa0de85615..69e9117c6e4 100644
--- a/sys/kern/kern_subr.c
+++ b/sys/kern/kern_subr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_subr.c,v 1.18 2001/06/26 06:27:40 aaron Exp $ */
+/* $OpenBSD: kern_subr.c,v 1.19 2001/06/27 04:49:45 art Exp $ */
/* $NetBSD: kern_subr.c,v 1.15 1996/04/09 17:21:56 ragge Exp $ */
/*
@@ -92,20 +92,12 @@ uiomove(cp, n, uio)
break;
case UIO_SYSSPACE:
-#if defined(UVM)
if (uio->uio_rw == UIO_READ)
error = kcopy(cp, iov->iov_base, cnt);
else
error = kcopy(iov->iov_base, cp, cnt);
if (error)
return(error);
-#else
- if (uio->uio_rw == UIO_READ)
- bcopy((caddr_t)cp, iov->iov_base, cnt);
- else
- bcopy(iov->iov_base, (caddr_t)cp, cnt);
- break;
-#endif
}
iov->iov_base = (caddr_t)iov->iov_base + cnt;
iov->iov_len -= cnt;
diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c
index f567273b29b..6777e6cb93e 100644
--- a/sys/kern/kern_synch.c
+++ b/sys/kern/kern_synch.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_synch.c,v 1.35 2001/06/24 20:55:16 mickey Exp $ */
+/* $OpenBSD: kern_synch.c,v 1.36 2001/06/27 04:49:45 art Exp $ */
/* $NetBSD: kern_synch.c,v 1.37 1996/04/22 01:38:37 christos Exp $ */
/*-
@@ -52,9 +52,7 @@
#include <sys/sched.h>
#include <sys/timeout.h>
-#if defined(UVM)
#include <uvm/uvm_extern.h>
-#endif
#ifdef KTRACE
#include <sys/ktrace.h>
@@ -277,11 +275,7 @@ schedcpu(arg)
}
splx(s);
}
-#if defined(UVM)
uvm_meter();
-#else
- vmmeter();
-#endif
wakeup((caddr_t)&lbolt);
timeout_add(to, hz);
}
@@ -730,11 +724,7 @@ mi_switch()
/*
* Pick a new current process and record its start time.
*/
-#if defined(UVM)
uvmexp.swtch++;
-#else
- cnt.v_swtch++;
-#endif
cpu_switch(p);
microtime(&runtime);
}
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:
diff --git a/sys/kern/subr_pool.c b/sys/kern/subr_pool.c
index cbb7f8ad949..25ca56ca4cd 100644
--- a/sys/kern/subr_pool.c
+++ b/sys/kern/subr_pool.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: subr_pool.c,v 1.9 2001/06/24 17:06:14 miod Exp $ */
+/* $OpenBSD: subr_pool.c,v 1.10 2001/06/27 04:49:46 art Exp $ */
/* $NetBSD: subr_pool.c,v 1.59 2001/06/05 18:51:04 thorpej Exp $ */
/*-
@@ -52,9 +52,7 @@
#include <vm/vm.h>
#include <vm/vm_kern.h>
-#if defined(UVM)
#include <uvm/uvm.h>
-#endif
/*
* XXX - for now.
@@ -1235,35 +1233,15 @@ pool_sethardlimit(struct pool *pp, int n, const char *warnmess, int ratecap)
static void *
pool_page_alloc(unsigned long sz, int flags, int mtype)
{
-#if defined(UVM)
boolean_t waitok = (flags & PR_WAITOK) ? TRUE : FALSE;
return ((void *)uvm_km_alloc_poolpage(waitok));
-#else
- boolean_t waitok = (flags & PR_WAITOK) ? TRUE : FALSE;
- int s;
- vaddr_t va;
-
- s = splimp();
- va = kmem_malloc(kmem_map, PAGE_SIZE, waitok);
- splx(s);
-
- return ((void *)va);
-#endif
}
static void
pool_page_free(void *v, unsigned long sz, int mtype)
{
-#if defined(UVM)
uvm_km_free_poolpage((vaddr_t)v);
-#else
- int s;
-
- s = splimp();
- kmem_free(kmem_map, (vaddr_t)v, PAGE_SIZE);
- splx(s);
-#endif
}
/*
@@ -1273,25 +1251,17 @@ pool_page_free(void *v, unsigned long sz, int mtype)
void *
pool_page_alloc_nointr(unsigned long sz, int flags, int mtype)
{
-#if defined(UVM)
boolean_t waitok = (flags & PR_WAITOK) ? TRUE : FALSE;
return ((void *)uvm_km_alloc_poolpage1(kernel_map, uvm.kernel_object,
waitok));
-#else
- return pool_page_alloc(sz, flags, mtype);
-#endif
}
void
pool_page_free_nointr(void *v, unsigned long sz, int mtype)
{
-#if defined(UVM)
uvm_km_free_poolpage1(kernel_map, (vaddr_t)v);
-#else
- pool_page_free(v, sz, mtype);
-#endif
}
diff --git a/sys/kern/subr_prf.c b/sys/kern/subr_prf.c
index b0b072c765e..cf2b0999813 100644
--- a/sys/kern/subr_prf.c
+++ b/sys/kern/subr_prf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: subr_prf.c,v 1.32 2001/06/22 14:14:09 deraadt Exp $ */
+/* $OpenBSD: subr_prf.c,v 1.33 2001/06/27 04:49:46 art Exp $ */
/* $NetBSD: subr_prf.c,v 1.45 1997/10/24 18:14:25 chuck Exp $ */
/*-
@@ -73,7 +73,7 @@
#include <ddb/db_output.h> /* db_printf, db_putchar prototypes */
extern int db_radix; /* XXX: for non-standard '%r' format */
#endif
-#if defined(UVM) && defined(UVM_SWAP_ENCRYPT)
+#if defined(UVM_SWAP_ENCRYPT)
extern int uvm_doswapencrypt;
#endif
@@ -192,7 +192,7 @@ panic(fmt, va_alist)
va_list ap;
bootopt = RB_AUTOBOOT | RB_DUMP;
-#if defined(UVM) && defined(UVM_SWAP_ENCRYPT)
+#if defined(UVM_SWAP_ENCRYPT)
if (uvm_doswapencrypt)
bootopt &= ~RB_DUMP;
#endif
diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c
index cdce94ac4c7..6398843326e 100644
--- a/sys/kern/sys_pipe.c
+++ b/sys/kern/sys_pipe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sys_pipe.c,v 1.35 2001/06/23 06:34:37 art Exp $ */
+/* $OpenBSD: sys_pipe.c,v 1.36 2001/06/27 04:49:46 art Exp $ */
/*
* Copyright (c) 1996 John S. Dyson
@@ -57,9 +57,7 @@
#include <vm/vm_map.h>
#include <vm/vm_page.h>
-#if defined(UVM)
#include <uvm/uvm_extern.h>
-#endif
#include <sys/pipe.h>
@@ -171,32 +169,11 @@ void
pipespace(cpipe)
struct pipe *cpipe;
{
-#if defined(UVM)
cpipe->pipe_buffer.buffer = (caddr_t) uvm_km_valloc(kernel_map,
cpipe->pipe_buffer.size);
if (cpipe->pipe_buffer.buffer == NULL)
panic("pipespace: out of kvm");
-#else
- int npages, error;
-
- npages = round_page(cpipe->pipe_buffer.size)/PAGE_SIZE;
- /*
- * Create an object, I don't like the idea of paging to/from
- * kernel_object.
- */
- cpipe->pipe_buffer.object = vm_object_allocate(npages);
- cpipe->pipe_buffer.buffer = (caddr_t) vm_map_min(kernel_map);
- /*
- * Insert the object into the kernel map, and allocate kva for it.
- * The map entry is, by default, pageable.
- */
- error = vm_map_find(kernel_map, cpipe->pipe_buffer.object, 0,
- (vaddr_t *) &cpipe->pipe_buffer.buffer,
- cpipe->pipe_buffer.size, 1);
- if (error != KERN_SUCCESS)
- panic("pipespace: out of kvm");
-#endif
amountpipekva += cpipe->pipe_buffer.size;
}
@@ -429,15 +406,9 @@ pipe_write(fp, poff, uio, cred)
if (wpipe->pipe_buffer.buffer) {
amountpipekva -= wpipe->pipe_buffer.size;
-#if defined(UVM)
uvm_km_free(kernel_map,
(vaddr_t)wpipe->pipe_buffer.buffer,
wpipe->pipe_buffer.size);
-#else
- kmem_free(kernel_map,
- (vaddr_t)wpipe->pipe_buffer.buffer,
- wpipe->pipe_buffer.size);
-#endif
}
wpipe->pipe_buffer.in = 0;
@@ -795,15 +766,9 @@ pipeclose(cpipe)
if (cpipe->pipe_buffer.size > PIPE_SIZE)
--nbigpipe;
amountpipekva -= cpipe->pipe_buffer.size;
-#if defined(UVM)
uvm_km_free(kernel_map,
(vaddr_t)cpipe->pipe_buffer.buffer,
cpipe->pipe_buffer.size);
-#else
- kmem_free(kernel_map,
- (vaddr_t)cpipe->pipe_buffer.buffer,
- cpipe->pipe_buffer.size);
-#endif
}
pool_put(&pipe_pool, cpipe);
}
diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c
index 2f95204b041..084bce95af1 100644
--- a/sys/kern/sys_process.c
+++ b/sys/kern/sys_process.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sys_process.c,v 1.12 2001/06/18 09:01:52 art Exp $ */
+/* $OpenBSD: sys_process.c,v 1.13 2001/06/27 04:49:47 art Exp $ */
/* $NetBSD: sys_process.c,v 1.55 1996/05/15 06:17:47 tls Exp $ */
/*-
@@ -65,10 +65,8 @@
#include <sys/mount.h>
#include <sys/syscallargs.h>
-#if defined(UVM)
#include <vm/vm.h>
#include <uvm/uvm_extern.h>
-#endif
#include <machine/reg.h>
diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c
index 74e5387b3fa..2f628635fe0 100644
--- a/sys/kern/sysv_shm.c
+++ b/sys/kern/sysv_shm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sysv_shm.c,v 1.18 2001/06/22 14:14:09 deraadt Exp $ */
+/* $OpenBSD: sysv_shm.c,v 1.19 2001/06/27 04:49:47 art Exp $ */
/* $NetBSD: sysv_shm.c,v 1.50 1998/10/21 22:24:29 tron Exp $ */
/*
@@ -47,12 +47,7 @@
#include <sys/syscallargs.h>
#include <vm/vm.h>
-#ifdef UVM
#include <uvm/uvm_extern.h>
-#else
-#include <vm/vm_map.h>
-#include <vm/vm_kern.h>
-#endif
struct shmid_ds *shm_find_segment_by_shmid __P((int));
@@ -77,11 +72,7 @@ struct shmid_ds *shm_find_segment_by_shmid __P((int));
int shm_last_free, shm_nused, shm_committed;
struct shm_handle {
-#ifdef UVM
struct uvm_object *shm_object;
-#else
- vm_object_t shm_object;
-#endif
};
struct shmmap_state {
@@ -137,11 +128,7 @@ shm_deallocate_segment(shmseg)
shm_handle = shmseg->shm_internal;
size = round_page(shmseg->shm_segsz);
-#ifdef UVM
uao_detach(shm_handle->shm_object);
-#else
- vm_object_deallocate(shm_handle->shm_object);
-#endif
free((caddr_t)shm_handle, M_SHM);
shmseg->shm_internal = NULL;
shm_committed -= btoc(size);
@@ -161,12 +148,7 @@ shm_delete_mapping(vm, shmmap_s)
segnum = IPCID_TO_IX(shmmap_s->shmid);
shmseg = &shmsegs[segnum];
size = round_page(shmseg->shm_segsz);
-#ifdef UVM
result = uvm_deallocate(&vm->vm_map, shmmap_s->va, size);
-#else
- result = vm_map_remove(&vm->vm_map, shmmap_s->va,
- shmmap_s->va + size);
-#endif
if (result != KERN_SUCCESS)
return EINVAL;
shmmap_s->shmid = -1;
@@ -267,7 +249,6 @@ sys_shmat(p, v, retval)
MAXTSIZ + MAXDSIZ);
}
shm_handle = shmseg->shm_internal;
-#ifdef UVM
uao_reference(shm_handle->shm_object);
rv = uvm_map(&p->p_vmspace->vm_map, &attach_va, size,
shm_handle->shm_object, 0, UVM_MAPFLAG(prot, prot,
@@ -275,18 +256,6 @@ sys_shmat(p, v, retval)
if (rv != KERN_SUCCESS) {
return ENOMEM;
}
-#else
- vm_object_reference(shm_handle->shm_object);
- rv = vm_map_find(&p->p_vmspace->vm_map, shm_handle->shm_object,
- 0, &attach_va, size, (flags & MAP_FIXED)?0:1);
- if (rv != KERN_SUCCESS) {
- return ENOMEM;
- }
- vm_map_protect(&p->p_vmspace->vm_map, attach_va, attach_va + size,
- prot, 0);
- vm_map_inherit(&p->p_vmspace->vm_map,
- attach_va, attach_va + size, VM_INHERIT_SHARE);
-#endif
shmmap_s->va = attach_va;
shmmap_s->shmid = SCARG(uap, shmid);
@@ -412,9 +381,6 @@ shmget_allocate_segment(p, uap, mode, retval)
struct ucred *cred = p->p_ucred;
struct shmid_ds *shmseg;
struct shm_handle *shm_handle;
-#ifndef UVM
- vm_pager_t pager;
-#endif
int error = 0;
if (SCARG(uap, size) < shminfo.shmmin ||
@@ -449,26 +415,7 @@ shmget_allocate_segment(p, uap, mode, retval)
shmid = IXSEQ_TO_IPCID(segnum, shmseg->shm_perm);
-#ifdef UVM
shm_handle->shm_object = uao_create(size, 0);
-#else
- shm_handle->shm_object = vm_object_allocate(size);
- if (shm_handle->shm_object == NULL) {
- /* XXX cannot happen */
- error = ENOMEM;
- goto out;
- }
- /*
- * We make sure that we have allocated a pager before we need
- * to.
- */
- pager = vm_pager_allocate(PG_DFLT, 0, size, VM_PROT_DEFAULT, 0);
- if (pager == NULL) {
- error = ENOMEM;
- goto out;
- }
- vm_object_setpager(shm_handle->shm_object, pager, 0, 0);
-#endif
shmseg->shm_internal = shm_handle;
shmseg->shm_perm.cuid = shmseg->shm_perm.uid = cred->cr_uid;
@@ -483,17 +430,7 @@ shmget_allocate_segment(p, uap, mode, retval)
shm_committed += btoc(size);
shm_nused++;
-#ifndef UVM
-out:
- if (error) {
- if (shm_handle->shm_object != NULL)
- vm_object_deallocate(shm_handle->shm_object);
- free(shm_handle, M_SHM);
- shmseg->shm_perm.mode = (shmseg->shm_perm.mode & SHMSEG_WANTED)
- | SHMSEG_FREE;
- } else
-#endif
- *retval = shmid;
+ *retval = shmid;
if (shmseg->shm_perm.mode & SHMSEG_WANTED) {
/*
* Somebody else wanted this key while we were asleep. Wake
diff --git a/sys/kern/uipc_mbuf.c b/sys/kern/uipc_mbuf.c
index 0f1f2a3baff..ca66569b876 100644
--- a/sys/kern/uipc_mbuf.c
+++ b/sys/kern/uipc_mbuf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uipc_mbuf.c,v 1.39 2001/06/27 03:53:50 angelos Exp $ */
+/* $OpenBSD: uipc_mbuf.c,v 1.40 2001/06/27 04:49:47 art Exp $ */
/* $NetBSD: uipc_mbuf.c,v 1.15.4.1 1996/06/13 17:11:44 cgd Exp $ */
/*
@@ -65,9 +65,7 @@ didn't get a copy, you may request one from <license@ipv6.nrl.navy.mil>.
#include <vm/vm.h>
-#if defined(UVM)
#include <uvm/uvm_extern.h>
-#endif
struct pool mbpool; /* mbuf pool */
struct pool mclpool; /* mbuf cluster pool */
@@ -117,14 +115,10 @@ mclpool_alloc(sz, flags, mtype)
int flags;
int mtype;
{
-#if defined(UVM)
boolean_t waitok = (flags & PR_WAITOK) ? TRUE : FALSE;
return ((void *)uvm_km_alloc_poolpage1(mb_map, uvmexp.mb_object,
waitok));
-#else
- return pool_page_alloc_nointr(sz, flags, mtype);
-#endif
}
void
@@ -133,11 +127,7 @@ mclpool_release(v, sz, mtype)
unsigned long sz;
int mtype;
{
-#if defined(UVM)
uvm_km_free_poolpage1(mb_map, (vaddr_t)v);
-#else
- pool_page_free_nointr(v, sz, mtype);
-#endif
}
/*
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index 7d22512d8cf..09dbc3cfd0b 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vfs_subr.c,v 1.62 2001/06/22 14:14:10 deraadt Exp $ */
+/* $OpenBSD: vfs_subr.c,v 1.63 2001/06/27 04:49:48 art Exp $ */
/* $NetBSD: vfs_subr.c,v 1.53 1996/04/22 01:39:13 christos Exp $ */
/*
@@ -69,10 +69,7 @@
#include <miscfs/specfs/specdev.h>
-#if defined(UVM)
#include <uvm/uvm_extern.h>
-#endif
-
enum vtype iftovt_tab[16] = {
VNON, VFIFO, VCHR, VNON, VDIR, VNON, VBLK, VNON,
@@ -463,9 +460,7 @@ getnewvnode(tag, mp, vops, vpp)
*vpp = vp;
vp->v_usecount = 1;
vp->v_data = 0;
-#ifdef UVM
simple_lock_init(&vp->v_uvm.u_obj.vmobjlock);
-#endif
return (0);
}
@@ -986,12 +981,10 @@ vclean(vp, flags, p)
*/
VOP_LOCK(vp, LK_DRAIN | LK_INTERLOCK, p);
-#ifdef UVM
/*
* clean out any VM data associated with the vnode.
*/
uvm_vnp_terminate(vp);
-#endif
/*
* Clean out any buffers associated with the vnode.
*/
@@ -1753,14 +1746,6 @@ vfs_shutdown()
printf("syncing disks... ");
if (panicstr == 0) {
- /* Release inodes held by texts before update. */
-#if !defined(UVM)
- vnode_pager_umount(NULL);
-#endif
-#ifdef notdef
- vnshutdown();
-#endif
-
/* Sync before unmount, in case we hang on something. */
sys_sync(&proc0, (void *)0, (register_t *)0);
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index 0ca88c8e73f..9fabe83751d 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vfs_syscalls.c,v 1.77 2001/06/22 14:14:11 deraadt Exp $ */
+/* $OpenBSD: vfs_syscalls.c,v 1.78 2001/06/27 04:49:48 art Exp $ */
/* $NetBSD: vfs_syscalls.c,v 1.71 1996/04/23 10:29:02 mycroft Exp $ */
/*
@@ -60,9 +60,7 @@
#include <vm/vm.h>
#include <sys/sysctl.h>
-#if defined(UVM)
#include <uvm/uvm_extern.h>
-#endif
extern int suid_clear;
int usermount = 0; /* sysctl: by default, users may not mount */
@@ -435,9 +433,6 @@ dounmount(mp, flags, p)
vfs_unbusy(mp, p);
lockmgr(&mp->mnt_lock, LK_DRAIN | LK_INTERLOCK, &mountlist_slock, p);
mp->mnt_flag &=~ MNT_ASYNC;
-#if !defined(UVM)
- vnode_pager_umount(mp); /* release cached vnodes */
-#endif
cache_purgevfs(mp); /* remove cache entries for this file sys */
if (mp->mnt_syncer != NULL)
vgone(mp->mnt_syncer);
@@ -500,9 +495,7 @@ sys_sync(p, v, retval)
if ((mp->mnt_flag & MNT_RDONLY) == 0) {
asyncflag = mp->mnt_flag & MNT_ASYNC;
mp->mnt_flag &= ~MNT_ASYNC;
-#if defined(UVM)
uvm_vnp_sync(mp);
-#endif
VFS_SYNC(mp, MNT_NOWAIT, p->p_ucred, p);
if (asyncflag)
mp->mnt_flag |= MNT_ASYNC;
@@ -1482,11 +1475,7 @@ sys_unlink(p, v, retval)
goto out;
}
-#if defined(UVM)
(void)uvm_vnp_uncache(vp);
-#else
- (void)vnode_pager_uncache(vp);
-#endif
VOP_LEASE(nd.ni_dvp, p, p->p_ucred, LEASE_WRITE);
VOP_LEASE(vp, p, p->p_ucred, LEASE_WRITE);
@@ -2350,11 +2339,7 @@ out:
if (fromnd.ni_dvp != tdvp)
VOP_LEASE(fromnd.ni_dvp, p, p->p_ucred, LEASE_WRITE);
if (tvp) {
-#if defined(UVM)
(void)uvm_vnp_uncache(tvp);
-#else
- (void)vnode_pager_uncache(tvp); /* XXX - I think we need this */
-#endif
VOP_LEASE(tvp, p, p->p_ucred, LEASE_WRITE);
}
error = VOP_RENAME(fromnd.ni_dvp, fromnd.ni_vp, &fromnd.ni_cnd,
diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c
index 15d137c8f6f..27a7a37a1c6 100644
--- a/sys/kern/vfs_vnops.c
+++ b/sys/kern/vfs_vnops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vfs_vnops.c,v 1.31 2001/06/22 14:14:11 deraadt Exp $ */
+/* $OpenBSD: vfs_vnops.c,v 1.32 2001/06/27 04:49:48 art Exp $ */
/* $NetBSD: vfs_vnops.c,v 1.20 1996/02/04 02:18:41 christos Exp $ */
/*
@@ -57,9 +57,7 @@
#include <vm/vm.h>
-#if defined(UVM)
#include <uvm/uvm_extern.h>
-#endif
int vn_read __P((struct file *fp, off_t *off, struct uio *uio,
struct ucred *cred));
@@ -205,13 +203,9 @@ vn_writechk(vp)
* the vnode, try to free it up once. If
* we fail, we can't allow writing.
*/
-#if defined(UVM)
if ((vp->v_flag & VTEXT) && !uvm_vnp_uncache(vp))
return (ETXTBSY);
-#else
- if ((vp->v_flag & VTEXT) && !vnode_pager_uncache(vp))
- return (ETXTBSY);
-#endif
+
return (0);
}
Copyright © 1996 – 2023 Jason A. Donenfeld. All Rights Reverse Engineered.