From e50f5c2e8d1b749b5478a54b7117a74c8a3fef7b Mon Sep 17 00:00:00 2001 From: Bruce Evans Date: Thu, 17 Jan 2002 16:46:26 +0000 Subject: [PATCH] Don't declare vm_swapout() in the NO_SWAPPING case when it is not defined. Fixed some style bugs. --- sys/vm/vm_glue.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c index b351e83fdc1..f9fb68cc5b4 100644 --- a/sys/vm/vm_glue.c +++ b/sys/vm/vm_glue.c @@ -111,8 +111,9 @@ SYSINIT(vm_limits, SI_SUB_VM_CONF, SI_ORDER_FIRST, vm_init_limits, &proc0) static void scheduler __P((void *)); SYSINIT(scheduler, SI_SUB_RUN_SCHEDULER, SI_ORDER_FIRST, scheduler, NULL) - +#ifndef NO_SWAPPING static void swapout __P((struct proc *)); +#endif int kernacc(addr, len, rw) @@ -123,7 +124,7 @@ kernacc(addr, len, rw) vm_offset_t saddr, eaddr; vm_prot_t prot; - KASSERT((rw & (~VM_PROT_ALL)) == 0, + KASSERT((rw & ~VM_PROT_ALL) == 0, ("illegal ``rw'' argument to kernacc (%x)\n", rw)); prot = rw; saddr = trunc_page((vm_offset_t)addr); @@ -146,7 +147,7 @@ useracc(addr, len, rw) GIANT_REQUIRED; - KASSERT((rw & (~VM_PROT_ALL)) == 0, + KASSERT((rw & ~VM_PROT_ALL) == 0, ("illegal ``rw'' argument to useracc (%x)\n", rw)); prot = rw; /* @@ -337,9 +338,6 @@ vm_init_limits(udata) p->p_rlimit[RLIMIT_RSS].rlim_max = RLIM_INFINITY; } -/* - * Must be called with the proc struc mutex held. - */ void faultin(p) struct proc *p;