From e451555eed066b0599876a00f6a20bb21b34f4d5 Mon Sep 17 00:00:00 2001 From: art Date: Mon, 13 Mar 2000 14:30:19 +0000 Subject: [PATCH] Put a lot more behind ifndef UVM. --- sys/vm/vm_extern.h | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/sys/vm/vm_extern.h b/sys/vm/vm_extern.h index 01b754c0f92..a7758ca0c96 100644 --- a/sys/vm/vm_extern.h +++ b/sys/vm/vm_extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vm_extern.h,v 1.16 1999/08/17 10:32:19 niklas Exp $ */ +/* $OpenBSD: vm_extern.h,v 1.17 2000/03/13 14:30:19 art Exp $ */ /* $NetBSD: vm_extern.h,v 1.20 1996/04/23 12:25:23 christos Exp $ */ /*- @@ -65,15 +65,10 @@ int sstk __P((struct proc *, void *, int *)); #endif void assert_wait __P((void *, boolean_t)); -#if !defined(UVM) -int grow __P((struct proc *, vm_offset_t)); -#endif void iprintf __P((int (*)(const char *, ...), const char *, ...)); #if !defined(UVM) +int grow __P((struct proc *, vm_offset_t)); int kernacc __P((caddr_t, int, int)); -#endif -int kinfo_loadavg __P((int, char *, int *, int, int *)); -int kinfo_meter __P((int, caddr_t, int *, int, int *)); vm_offset_t kmem_alloc __P((vm_map_t, vm_size_t)); vm_offset_t kmem_alloc_pageable __P((vm_map_t, vm_size_t)); vm_offset_t kmem_alloc_wait __P((vm_map_t, vm_size_t)); @@ -84,28 +79,23 @@ vm_offset_t kmem_malloc __P((vm_map_t, vm_size_t, boolean_t)); vm_map_t kmem_suballoc __P((vm_map_t, vm_offset_t *, vm_offset_t *, vm_size_t, boolean_t)); void loadav __P((struct loadavg *)); -#if !defined(UVM) void munmapfd __P((struct proc *, int)); -#endif int pager_cache __P((vm_object_t, boolean_t)); void sched __P((void)); -#if !defined(UVM) #ifdef __GNUC__ void scheduler __P((void)) __attribute ((noreturn)); #else void scheduler __P((void)); #endif -#endif int svm_allocate __P((struct proc *, void *, int *)); int svm_deallocate __P((struct proc *, void *, int *)); int svm_inherit __P((struct proc *, void *, int *)); int svm_protect __P((struct proc *, void *, int *)); void swapinit __P((void)); -#if !defined(UVM) void swapout __P((struct proc *)); void swapout_threads __P((void)); -#endif int swfree __P((struct proc *, int)); +#endif /* !UVM */ void swstrategy __P((struct buf *)); void thread_block __P((char *)); void thread_sleep_msg __P((void *, simple_lock_t, @@ -130,46 +120,36 @@ int vm_allocate_with_pager __P((vm_map_t, vm_offset_t *, int vm_coredump __P((struct proc *, struct vnode *, struct ucred *, struct core *)); int vm_deallocate __P((vm_map_t, vm_offset_t, vm_size_t)); -#endif int vm_fault __P((vm_map_t, vm_offset_t, vm_prot_t, boolean_t)); void vm_fault_copy_entry __P((vm_map_t, vm_map_t, vm_map_entry_t, vm_map_entry_t)); void vm_fault_unwire __P((vm_map_t, vm_offset_t, vm_offset_t)); int vm_fault_wire __P((vm_map_t, vm_offset_t, vm_offset_t)); -#if !defined(UVM) #ifdef __FORK_BRAINDAMAGE int vm_fork __P((struct proc *, struct proc *, void *, size_t)); #else void vm_fork __P((struct proc *, struct proc *, void *, size_t)); #endif -#endif int vm_inherit __P((vm_map_t, vm_offset_t, vm_size_t, vm_inherit_t)); -#if !defined(UVM) void vm_init_limits __P((struct proc *)); -#endif void vm_mem_init __P((void)); -#if !defined(UVM) int vm_mmap __P((vm_map_t, vm_offset_t *, vm_size_t, vm_prot_t, vm_prot_t, int, caddr_t, vm_offset_t)); -#endif int vm_protect __P((vm_map_t, vm_offset_t, vm_size_t, boolean_t, vm_prot_t)); void vm_set_page_size __P((void)); void vmmeter __P((void)); -#if !defined(UVM) struct vmspace *vmspace_alloc __P((vm_offset_t, vm_offset_t, int)); struct vmspace *vmspace_fork __P((struct vmspace *)); void vmspace_free __P((struct vmspace *)); -#endif void vmtotal __P((struct vmtotal *)); void vnode_pager_setsize __P((struct vnode *, u_long)); void vnode_pager_umount __P((struct mount *)); boolean_t vnode_pager_uncache __P((struct vnode *)); -#if !defined(UVM) int vslock __P((caddr_t, u_int)); int vsunlock __P((caddr_t, u_int)); -#endif +#endif /* !UVM */ /* Machine dependent portion */ void vmapbuf __P((struct buf *, vm_size_t)); -- 2.20.1