From 289f11acb49b6dbb3081e09bf94a86f008f55814 Mon Sep 17 00:00:00 2001 From: bde Date: Thu, 16 Mar 1995 18:17:34 +0000 Subject: Add and move declarations to fix all of the warnings from `gcc -Wimplicit' (except in netccitt, netiso and netns) and most of the warnings from `gcc -Wnested-externs'. Fix all the bugs found. There were no serious ones. --- sys/vm/vm_extern.h | 8 ++++++-- sys/vm/vm_init.c | 5 +---- sys/vm/vm_map.c | 4 ++-- sys/vm/vm_map.h | 5 ++++- sys/vm/vm_mmap.c | 4 ++-- sys/vm/vm_object.c | 3 +-- sys/vm/vm_object.h | 8 +++++++- sys/vm/vm_page.c | 8 ++------ sys/vm/vm_pageout.c | 4 ++-- sys/vm/vm_pageout.h | 4 +++- sys/vm/vm_pager.h | 3 ++- sys/vm/vm_swap.c | 4 +++- sys/vm/vnode_pager.c | 3 +-- 13 files changed, 36 insertions(+), 27 deletions(-) (limited to 'sys/vm') diff --git a/sys/vm/vm_extern.h b/sys/vm/vm_extern.h index 50807a0..2dae26e 100644 --- a/sys/vm/vm_extern.h +++ b/sys/vm/vm_extern.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)vm_extern.h 8.2 (Berkeley) 1/12/94 - * $Id: vm_extern.h,v 1.11 1995/02/20 23:58:09 davidg Exp $ + * $Id: vm_extern.h,v 1.12 1995/02/21 01:32:47 davidg Exp $ */ #ifndef _VM_EXTERN_H_ @@ -62,6 +62,8 @@ void thread_sleep_ __P((int, simple_lock_t, char *)); #endif #ifdef KERNEL +extern int indent; + #ifdef TYPEDEF_FOR_UAP int getpagesize __P((struct proc * p, void *, int *)); int madvise __P((struct proc *, void *, int *)); @@ -73,10 +75,12 @@ int obreak __P((struct proc *, void *, int *)); int sbrk __P((struct proc *, void *, int *)); int smmap __P((struct proc *, void *, int *)); int sstk __P((struct proc *, void *, int *)); +int swapon __P((struct proc *, void *, int *)); #endif void assert_wait __P((int, boolean_t)); +void faultin __P((struct proc *p)); int grow __P((struct proc *, u_int)); void iprintf __P((const char *,...)); int kernacc __P((caddr_t, int, int)); @@ -95,7 +99,6 @@ void munmapfd __P((struct proc *, int)); int pager_cache __P((vm_object_t, boolean_t)); void sched __P((void)); void swapinit __P((void)); -int swapon __P((struct proc *, void *, int *)); void swapout __P((struct proc *)); void swapout_threads __P((void)); int swfree __P((struct proc *, int)); @@ -119,6 +122,7 @@ 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 *)); void vmtotal __P((struct vmtotal *)); +vm_pager_t vnode_pager_alloc __P((caddr_t, vm_offset_t, vm_prot_t, vm_offset_t)); void vnode_pager_setsize __P((struct vnode *, u_long)); void vnode_pager_umount __P((struct mount *)); boolean_t vnode_pager_uncache __P((struct vnode *)); diff --git a/sys/vm/vm_init.c b/sys/vm/vm_init.c index 6406c1e..64f3814 100644 --- a/sys/vm/vm_init.c +++ b/sys/vm/vm_init.c @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_init.c,v 1.4 1994/10/09 01:52:09 phk Exp $ + * $Id: vm_init.c,v 1.5 1995/01/09 16:05:42 davidg Exp $ */ /* @@ -85,9 +85,6 @@ void vm_mem_init() { - extern vm_offset_t avail_start, avail_end; - extern vm_offset_t virtual_avail, virtual_end; - /* * Initializes resident memory structures. From here on, all physical * memory is accounted for, and we use only virtual addresses. diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 43cf626..4055b98 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_map.c,v 1.15 1995/02/21 01:13:05 davidg Exp $ + * $Id: vm_map.c,v 1.16 1995/03/01 23:29:56 davidg Exp $ */ /* @@ -71,6 +71,7 @@ #include #include #include +#include #include #include @@ -2608,7 +2609,6 @@ vm_map_print(map, full) boolean_t full; { register vm_map_entry_t entry; - extern int indent; iprintf("%s map 0x%x: pmap=0x%x,ref=%d,nentries=%d,version=%d\n", (map->is_main_map ? "Task" : "Share"), diff --git a/sys/vm/vm_map.h b/sys/vm/vm_map.h index c940e8a..f250144 100644 --- a/sys/vm/vm_map.h +++ b/sys/vm/vm_map.h @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_map.h,v 1.3 1994/08/02 07:55:26 davidg Exp $ + * $Id: vm_map.h,v 1.4 1995/01/09 16:05:46 davidg Exp $ */ /* @@ -181,6 +181,9 @@ typedef struct { #define MAX_KMAPENT 128 #ifdef KERNEL +extern vm_offset_t kentry_data; +extern vm_size_t kentry_data_size; + boolean_t vm_map_check_protection __P((vm_map_t, vm_offset_t, vm_offset_t, vm_prot_t)); int vm_map_copy __P((vm_map_t, vm_map_t, vm_offset_t, vm_size_t, vm_offset_t, boolean_t, boolean_t)); void vm_map_copy_entry __P((vm_map_t, vm_map_t, vm_map_entry_t, vm_map_entry_t)); diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c index 03324bc..b858702 100644 --- a/sys/vm/vm_mmap.c +++ b/sys/vm/vm_mmap.c @@ -38,7 +38,7 @@ * from: Utah $Hdr: vm_mmap.c 1.6 91/10/21$ * * @(#)vm_mmap.c 8.4 (Berkeley) 1/12/94 - * $Id: vm_mmap.c,v 1.12 1995/03/07 17:27:49 davidg Exp $ + * $Id: vm_mmap.c,v 1.13 1995/03/12 08:11:34 davidg Exp $ */ /* @@ -59,6 +59,7 @@ #include #include +#include #include #ifdef DEBUG @@ -528,7 +529,6 @@ mlock(p, uap, retval) vm_offset_t addr; vm_size_t size; int error; - extern int vm_page_max_wired; #ifdef DEBUG if (mmapdebug & MDB_FOLLOW) diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index d0410b5..de9b90e 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_object.c,v 1.30 1995/03/12 07:58:28 davidg Exp $ + * $Id: vm_object.c,v 1.31 1995/03/12 08:08:06 davidg Exp $ */ /* @@ -1694,7 +1694,6 @@ vm_object_print(object, full) boolean_t full; { register vm_page_t p; - extern indent; register int count; diff --git a/sys/vm/vm_object.h b/sys/vm/vm_object.h index c788cf7..11ff6a6 100644 --- a/sys/vm/vm_object.h +++ b/sys/vm/vm_object.h @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_object.h,v 1.11 1995/03/12 08:05:46 davidg Exp $ + * $Id: vm_object.h,v 1.12 1995/03/12 12:42:00 bde Exp $ */ /* @@ -71,6 +71,10 @@ #ifndef _VM_OBJECT_ #define _VM_OBJECT_ +#ifdef KERNEL +#include /* XXX for wakeup() */ +#endif + #include #include @@ -120,6 +124,8 @@ struct vm_object_hash_entry { typedef struct vm_object_hash_entry *vm_object_hash_entry_t; #ifdef KERNEL +extern int vm_object_cache_max; + TAILQ_HEAD(object_q, vm_object); struct object_q vm_object_cached_list; /* list of objects persisting */ diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index cdac17c..71eb2ef 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)vm_page.c 7.4 (Berkeley) 5/7/91 - * $Id: vm_page.c,v 1.22 1995/02/22 10:27:16 davidg Exp $ + * $Id: vm_page.c,v 1.23 1995/03/01 23:29:59 davidg Exp $ */ /* @@ -73,6 +73,7 @@ #include #include +#include #include #include #include @@ -165,10 +166,6 @@ vm_page_startup(starta, enda, vaddr) int nblocks; vm_offset_t first_managed_page; - extern vm_offset_t kentry_data; - extern vm_size_t kentry_data_size; - extern vm_offset_t phys_avail[]; - /* the biggest memory array is the second group of pages */ vm_offset_t start; vm_offset_t biggestone, biggestsize; @@ -693,7 +690,6 @@ vm_page_alloc_contig(size, low, high, alignment) int i, s, start; vm_offset_t addr, phys, tmp_addr; vm_page_t pga = vm_page_array; - extern vm_map_t kernel_map; if ((alignment & (alignment - 1)) != 0) panic("vm_page_alloc_contig: alignment must be a power of 2"); diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c index 36851bc..b3c0966 100644 --- a/sys/vm/vm_pageout.c +++ b/sys/vm/vm_pageout.c @@ -65,7 +65,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_pageout.c,v 1.40 1995/03/01 23:30:02 davidg Exp $ + * $Id: vm_pageout.c,v 1.41 1995/03/12 07:58:29 davidg Exp $ */ /* @@ -74,6 +74,7 @@ #include #include +#include #include #include #include @@ -472,7 +473,6 @@ vm_pageout_map_deactivate_pages(map, entry, count, freeer) void vm_req_vmdaemon() { - extern int ticks; static int lastrun = 0; if ((ticks > (lastrun + hz / 10)) || (ticks < lastrun)) { diff --git a/sys/vm/vm_pageout.h b/sys/vm/vm_pageout.h index 6e77a33..b44fe3d 100644 --- a/sys/vm/vm_pageout.h +++ b/sys/vm/vm_pageout.h @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_pageout.h,v 1.8 1995/01/10 07:32:50 davidg Exp $ + * $Id: vm_pageout.h,v 1.9 1995/03/01 23:30:03 davidg Exp $ */ #ifndef _VM_VM_PAGEOUT_H_ @@ -75,6 +75,7 @@ * Exported data structures. */ +extern int vm_page_max_wired; extern int vm_pages_needed; /* should be some "event" structure */ simple_lock_data_t vm_pages_needed_lock; extern int vm_pageout_pages_needed; @@ -124,6 +125,7 @@ vm_wait() #ifdef KERNEL +void vm_daemon __P((void)); int vm_pageout_scan __P((void)); void vm_pageout_page __P((vm_page_t, vm_object_t)); void vm_pageout_cluster __P((vm_page_t, vm_object_t)); diff --git a/sys/vm/vm_pager.h b/sys/vm/vm_pager.h index 939b727..9dfbe73 100644 --- a/sys/vm/vm_pager.h +++ b/sys/vm/vm_pager.h @@ -37,7 +37,7 @@ * SUCH DAMAGE. * * @(#)vm_pager.h 8.4 (Berkeley) 1/12/94 - * $Id: vm_pager.h,v 1.4 1994/10/09 01:52:17 phk Exp $ + * $Id: vm_pager.h,v 1.5 1995/01/09 16:05:56 davidg Exp $ */ /* @@ -108,6 +108,7 @@ extern struct pagerops *dfltpagerops; vm_pager_t vm_pager_allocate __P((int, caddr_t, vm_size_t, vm_prot_t, vm_offset_t)); vm_page_t vm_pager_atop __P((vm_offset_t)); +void vm_pager_bufferinit __P((void)); void vm_pager_deallocate __P((vm_pager_t)); int vm_pager_get_pages __P((vm_pager_t, vm_page_t *, int, int, boolean_t)); boolean_t vm_pager_has_page __P((vm_pager_t, vm_offset_t)); diff --git a/sys/vm/vm_swap.c b/sys/vm/vm_swap.c index 30641df..c09dbf7 100644 --- a/sys/vm/vm_swap.c +++ b/sys/vm/vm_swap.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)vm_swap.c 8.5 (Berkeley) 2/17/94 - * $Id: vm_swap.c,v 1.13 1995/01/09 16:05:58 davidg Exp $ + * $Id: vm_swap.c,v 1.14 1995/01/10 07:32:51 davidg Exp $ */ #include @@ -45,6 +45,8 @@ #include #include +#include + #include /* diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c index 05dcc45..099ff14 100644 --- a/sys/vm/vnode_pager.c +++ b/sys/vm/vnode_pager.c @@ -37,7 +37,7 @@ * SUCH DAMAGE. * * from: @(#)vnode_pager.c 7.5 (Berkeley) 4/20/91 - * $Id: vnode_pager.c,v 1.28 1995/03/07 19:04:10 davidg Exp $ + * $Id: vnode_pager.c,v 1.29 1995/03/12 07:56:06 davidg Exp $ */ /* @@ -85,7 +85,6 @@ int vnode_pager_putmulti(); void vnode_pager_init(); -vm_pager_t vnode_pager_alloc(caddr_t, vm_offset_t, vm_prot_t, vm_offset_t); void vnode_pager_dealloc(); int vnode_pager_getpage(); int vnode_pager_getmulti(); -- cgit v1.1