Be consistent about "static" functions: if the function is marked

static in its prototype, mark it static at the definition too.

Inspired by:    FlexeLint warning #512

68 files changed, 174 insertions, 173 deletions

diff --git a/sys/amd64/amd64/fpu.c b/sys/amd64/amd64/fpu.c
index 29e5f06..bbb7253 100644
--- a/sys/amd64/amd64/fpu.c
+++ b/sys/amd64/amd64/fpu.c
@@ -453,7 +453,7 @@ no_irq13:
 /*
  * Attach routine - announce which it is, and wire into system
  */
-int
+static int
 npx_attach(dev)
 	device_t dev;
 {
diff --git a/sys/amd64/amd64/initcpu.c b/sys/amd64/amd64/initcpu.c
index 7bc83f8..65464c2 100644
--- a/sys/amd64/amd64/initcpu.c
+++ b/sys/amd64/amd64/initcpu.c
@@ -489,7 +489,7 @@ init_ppro(void)
  * Initialize BBL_CR_CTL3 (Control register 3: used to configure the
  * L2 cache).
  */
-void
+static void
 init_mendocino(void)
 {
 #ifdef CPU_PPRO2CELERON
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
index 1318ebb..57e54c6 100644
--- a/sys/amd64/amd64/pmap.c
+++ b/sys/amd64/amd64/pmap.c
@@ -466,7 +466,7 @@ pmap_set_opt(void)
 	}
 }
 
-void *
+static void *
 pmap_allocf(uma_zone_t zone, int bytes, u_int8_t *flags, int wait)
 {
 	*flags = UMA_SLAB_PRIV;
diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c
index cdfc327..444bcf3 100644
--- a/sys/amd64/amd64/trap.c
+++ b/sys/amd64/amd64/trap.c
@@ -671,7 +671,7 @@ out:
 	return;
 }
 
-int
+static int
 trap_pfault(frame, usermode, eva)
 	struct trapframe *frame;
 	int usermode;
diff --git a/sys/amd64/isa/npx.c b/sys/amd64/isa/npx.c
index 29e5f06..bbb7253 100644
--- a/sys/amd64/isa/npx.c
+++ b/sys/amd64/isa/npx.c
@@ -453,7 +453,7 @@ no_irq13:
 /*
  * Attach routine - announce which it is, and wire into system
  */
-int
+static int
 npx_attach(dev)
 	device_t dev;
 {
diff --git a/sys/cam/scsi/scsi_cd.c b/sys/cam/scsi/scsi_cd.c
index 99ad08f..e9bf89d 100644
--- a/sys/cam/scsi/scsi_cd.c
+++ b/sys/cam/scsi/scsi_cd.c
@@ -302,7 +302,7 @@ struct cdchanger {
 
 static STAILQ_HEAD(changerlist, cdchanger) changerq;
 
-void
+static void
 cdinit(void)
 {
 	cam_status status;
diff --git a/sys/cam/scsi/scsi_ch.c b/sys/cam/scsi/scsi_ch.c
index d876400..fcbb53b 100644
--- a/sys/cam/scsi/scsi_ch.c
+++ b/sys/cam/scsi/scsi_ch.c
@@ -226,7 +226,7 @@ static struct cdevsw ch_cdevsw = {
 	/* flags */	0,
 };
 
-void
+static void
 chinit(void)
 {
 	cam_status status;
diff --git a/sys/cam/scsi/scsi_low.c b/sys/cam/scsi/scsi_low.c
index 59b1c59..610746e 100644
--- a/sys/cam/scsi/scsi_low.c
+++ b/sys/cam/scsi/scsi_low.c
@@ -4362,7 +4362,7 @@ io_resume:
 /**********************************************************
  * TAG operations
  **********************************************************/
-int
+static int
 scsi_low_alloc_qtag(cb)
 	struct slccb *cb;
 {
@@ -4399,7 +4399,7 @@ found:
 #endif	/* SCSI_LOW_ALT_QTAG_ALLOCATE */
 }
 	
-int
+static int
 scsi_low_dealloc_qtag(cb)
 	struct slccb *cb;
 {
@@ -4430,7 +4430,7 @@ scsi_low_dealloc_qtag(cb)
 	return 0;
 }
 
-struct slccb *
+static struct slccb *
 scsi_low_revoke_ccb(slp, cb, fdone)
 	struct scsi_low_softc *slp;
 	struct slccb *cb;
@@ -4483,7 +4483,7 @@ scsi_low_revoke_ccb(slp, cb, fdone)
 	}
 }
 
-void
+static void
 scsi_low_reset_nexus_lun(slp, li, fdone)
 	struct scsi_low_softc *slp;
 	struct lun_info *li;
diff --git a/sys/cam/scsi/scsi_ses.c b/sys/cam/scsi/scsi_ses.c
index c469763..904e380 100644
--- a/sys/cam/scsi/scsi_ses.c
+++ b/sys/cam/scsi/scsi_ses.c
@@ -191,7 +191,7 @@ static struct cdevsw ses_cdevsw =
 	/* flags */	0,
 };
 
-void
+static void
 sesinit(void)
 {
 	cam_status status;
@@ -1642,7 +1642,7 @@ static char *safte_2little = "Too Little Data Returned (%d) at line %d\n";
 	}
 
 
-int
+static int
 safte_softc_init(ses_softc_t *ssc, int doinit)
 {
 	int err, i, r;
@@ -1719,7 +1719,7 @@ safte_softc_init(ses_softc_t *ssc, int doinit)
 	return (0);
 }
 
-int
+static int
 safte_init_enc(ses_softc_t *ssc)
 {
 	int err;
@@ -1734,13 +1734,13 @@ safte_init_enc(ses_softc_t *ssc)
 	return (err);
 }
 
-int
+static int
 safte_get_encstat(ses_softc_t *ssc, int slpflg)
 {
 	return (safte_rdstat(ssc, slpflg));
 }
 
-int
+static int
 safte_set_encstat(ses_softc_t *ssc, uint8_t encstat, int slpflg)
 {
 	struct scfg *cc = ssc->ses_private;
@@ -1764,7 +1764,7 @@ safte_set_encstat(ses_softc_t *ssc, uint8_t encstat, int slpflg)
 	return (wrbuf16(ssc, SAFTE_WT_GLOBAL, cc->flag1, cc->flag2, 0, slpflg));
 }
 
-int
+static int
 safte_get_objstat(ses_softc_t *ssc, ses_objstat *obp, int slpflg)
 {
 	int i = (int)obp->obj_id;
@@ -1783,7 +1783,7 @@ safte_get_objstat(ses_softc_t *ssc, ses_objstat *obp, int slpflg)
 }
 
 
-int
+static int
 safte_set_objstat(ses_softc_t *ssc, ses_objstat *obp, int slp)
 {
 	int idx, err;
diff --git a/sys/ddb/db_input.c b/sys/ddb/db_input.c
index bee293f..d9578d8 100644
--- a/sys/ddb/db_input.c
+++ b/sys/ddb/db_input.c
@@ -69,7 +69,7 @@ static int	db_inputchar(int c);
 static void	db_putnchars(int c, int count);
 static void	db_putstring(char *s, int count);
 
-void
+static void
 db_putstring(s, count)
 	char	*s;
 	int	count;
@@ -78,7 +78,7 @@ db_putstring(s, count)
 	    cnputc(*s++);
 }
 
-void
+static void
 db_putnchars(c, count)
 	int	c;
 	int	count;
@@ -92,7 +92,7 @@ db_putnchars(c, count)
  */
 #define	DEL_FWD		0
 #define	DEL_BWD		1
-void
+static void
 db_delete(n, bwd)
 	int	n;
 	int	bwd;
@@ -113,7 +113,7 @@ db_delete(n, bwd)
 }
 
 /* returns TRUE at end-of-line */
-int
+static int
 db_inputchar(c)
 	int	c;
 {
@@ -290,7 +290,7 @@ db_inputchar(c)
 	return (0);
 }
 
-int
+static int
 cnmaygetc()
 {
 	return (-1);
diff --git a/sys/ddb/db_watch.c b/sys/ddb/db_watch.c
index f25b295..127e3bb 100644
--- a/sys/ddb/db_watch.c
+++ b/sys/ddb/db_watch.c
@@ -71,7 +71,7 @@ int  db_md_clr_watchpoint(db_expr_t addr, db_expr_t size);
 void db_md_list_watchpoints(void);
 
 
-db_watchpoint_t
+static db_watchpoint_t
 db_watchpoint_alloc()
 {
 	register db_watchpoint_t	watch;
@@ -90,7 +90,7 @@ db_watchpoint_alloc()
 	return (watch);
 }
 
-void
+static void
 db_watchpoint_free(watch)
 	register db_watchpoint_t	watch;
 {
diff --git a/sys/dev/advansys/advansys.c b/sys/dev/advansys/advansys.c
index 40287e9..fcd7d3f 100644
--- a/sys/dev/advansys/advansys.c
+++ b/sys/dev/advansys/advansys.c
@@ -1030,7 +1030,7 @@ adv_intr(void *arg)
 	ADV_OUTB(adv, ADV_CHIP_CTRL, saved_ctrl_reg);
 }
 
-void
+static void
 adv_run_doneq(struct adv_softc *adv)
 {
 	struct adv_q_done_info scsiq;
diff --git a/sys/dev/aic/aic.c b/sys/dev/aic/aic.c
index 57ac112..355968e 100644
--- a/sys/dev/aic/aic.c
+++ b/sys/dev/aic/aic.c
@@ -499,7 +499,7 @@ aic_spiordy(struct aic_softc *aic)
 /*
  * Reestablish a disconnected nexus.
  */
-void
+static void
 aic_reconnect(struct aic_softc *aic, int tag)
 {
 	struct aic_scb *scb;
diff --git a/sys/dev/aic7xxx/aic7xxx.c b/sys/dev/aic7xxx/aic7xxx.c
index bb67c5c..a63000b 100644
--- a/sys/dev/aic7xxx/aic7xxx.c
+++ b/sys/dev/aic7xxx/aic7xxx.c
@@ -1573,7 +1573,7 @@ ahc_free_tstate(struct ahc_softc *ahc, u_int scsi_id, char channel, int force)
  * by the capabilities of the bus connectivity of and sync settings for
  * the target.
  */
-struct ahc_syncrate *
+static struct ahc_syncrate *
 ahc_devlimited_syncrate(struct ahc_softc *ahc,
 			struct ahc_initiator_tinfo *tinfo,
 			u_int *period, u_int *ppr_options, role_t role)
diff --git a/sys/dev/amr/amr.c b/sys/dev/amr/amr.c
index ff8c472..44c0a2d 100644
--- a/sys/dev/amr/amr.c
+++ b/sys/dev/amr/amr.c
@@ -339,7 +339,7 @@ amr_submit_bio(struct amr_softc *sc, struct bio *bio)
 /********************************************************************************
  * Accept an open operation on the control device.
  */
-int
+static int
 amr_open(dev_t dev, int flags, int fmt, struct thread *td)
 {
     int			unit = minor(dev);
@@ -354,7 +354,7 @@ amr_open(dev_t dev, int flags, int fmt, struct thread *td)
 /********************************************************************************
  * Accept the last close on the control device.
  */
-int
+static int
 amr_close(dev_t dev, int flags, int fmt, struct thread *td)
 {
     int			unit = minor(dev);
@@ -369,7 +369,7 @@ amr_close(dev_t dev, int flags, int fmt, struct thread *td)
 /********************************************************************************
  * Handle controller-specific control operations.
  */
-int
+static int
 amr_ioctl(dev_t dev, u_long cmd, caddr_t addr, int32_t flag, struct thread *td)
 {
     struct amr_softc		*sc = (struct amr_softc *)dev->si_drv1;
@@ -1300,7 +1300,7 @@ amr_releasecmd(struct amr_command *ac)
 /********************************************************************************
  * Allocate a new command cluster and initialise it.
  */
-void
+static void
 amr_alloccmd_cluster(struct amr_softc *sc)
 {
     struct amr_command_cluster	*acc;
@@ -1326,7 +1326,7 @@ amr_alloccmd_cluster(struct amr_softc *sc)
 /********************************************************************************
  * Free a command cluster
  */
-void
+static void
 amr_freecmd_cluster(struct amr_command_cluster *acc)
 {
     struct amr_softc	*sc = acc->acc_command[0].ac_sc;
diff --git a/sys/dev/an/if_an.c b/sys/dev/an/if_an.c
index 7f06976..9d44500 100644
--- a/sys/dev/an/if_an.c
+++ b/sys/dev/an/if_an.c
@@ -700,7 +700,7 @@ an_txeof(sc, status)
  * the NIC has synchronized to the current cell (either as the master
  * in an ad-hoc group, or as a station connected to an access point).
  */
-void
+static void
 an_stats_update(xsc)
 	void			*xsc;
 {
diff --git a/sys/dev/ata/atapi-cam.c b/sys/dev/ata/atapi-cam.c
index b8294ab..3aebdab 100644
--- a/sys/dev/ata/atapi-cam.c
+++ b/sys/dev/ata/atapi-cam.c
@@ -489,7 +489,7 @@ atapi_poll(struct cam_sim *sim)
     printf("atapi_poll called!\n");
 }
 
-int 
+static int 
 atapi_cb(struct atapi_request *req)
 {
     struct atapi_hcb *hcb = (struct atapi_hcb *) req->driver;
diff --git a/sys/dev/bktr/bktr_core.c b/sys/dev/bktr/bktr_core.c
index e14ba84..c0be614 100644
--- a/sys/dev/bktr/bktr_core.c
+++ b/sys/dev/bktr/bktr_core.c
@@ -2298,7 +2298,7 @@ tuner_ioctl( bktr_ptr_t bktr, int unit, ioctl_cmd_t cmd, caddr_t arg, struct thr
 /*
  * common ioctls
  */
-int
+static int
 common_ioctl( bktr_ptr_t bktr, ioctl_cmd_t cmd, caddr_t arg )
 {
         int                           pixfmt;
@@ -2544,7 +2544,7 @@ dump_bt848( bktr_ptr_t bktr )
 #define BKTR_TEST_RISC_STATUS_BIT2 (1 << 30)
 #define BKTR_TEST_RISC_STATUS_BIT3 (1 << 31)
 
-bool_t notclipped (bktr_reg_t * bktr, int x, int width) {
+static bool_t notclipped (bktr_reg_t * bktr, int x, int width) {
     int i;
     bktr_clip_t * clip_node;
     bktr->clip_start = -1;
@@ -2571,7 +2571,7 @@ bool_t notclipped (bktr_reg_t * bktr, int x, int width) {
     return TRUE;
 }	
 
-bool_t getline(bktr_reg_t *bktr, int x ) {
+static bool_t getline(bktr_reg_t *bktr, int x ) {
     int i, j;
     bktr_clip_t * clip_node ;
     
diff --git a/sys/dev/bktr/bktr_os.c b/sys/dev/bktr/bktr_os.c
index f22fcea..e26dc33 100644
--- a/sys/dev/bktr/bktr_os.c
+++ b/sys/dev/bktr/bktr_os.c
@@ -571,7 +571,7 @@ get_bktr_mem( int unit, unsigned size )
 /*
  * 
  */
-int
+static int
 bktr_open( dev_t dev, int flags, int fmt, struct thread *td )
 {
 	bktr_ptr_t	bktr;
@@ -651,7 +651,7 @@ bktr_open( dev_t dev, int flags, int fmt, struct thread *td )
 /*
  * 
  */
-int
+static int
 bktr_close( dev_t dev, int flags, int fmt, struct thread *td )
 {
 	bktr_ptr_t	bktr;
@@ -690,7 +690,7 @@ bktr_close( dev_t dev, int flags, int fmt, struct thread *td )
 /*
  * 
  */
-int
+static int
 bktr_read( dev_t dev, struct uio *uio, int ioflag )
 {
 	bktr_ptr_t	bktr;
@@ -718,7 +718,7 @@ bktr_read( dev_t dev, struct uio *uio, int ioflag )
 /*
  * 
  */
-int
+static int
 bktr_write( dev_t dev, struct uio *uio, int ioflag )
 {
 	return( EINVAL ); /* XXX or ENXIO ? */
@@ -728,7 +728,7 @@ bktr_write( dev_t dev, struct uio *uio, int ioflag )
 /*
  * 
  */
-int
+static int
 bktr_ioctl( dev_t dev, ioctl_cmd_t cmd, caddr_t arg, int flag, struct thread *td )
 {
 	bktr_ptr_t	bktr;
@@ -760,7 +760,7 @@ bktr_ioctl( dev_t dev, ioctl_cmd_t cmd, caddr_t arg, int flag, struct thread *td
 /*
  * 
  */
-int
+static int
 bktr_mmap( dev_t dev, vm_offset_t offset, int nprot )
 {
 	int		unit;
@@ -790,7 +790,8 @@ bktr_mmap( dev_t dev, vm_offset_t offset, int nprot )
 	return( atop(vtophys(bktr->bigbuf) + offset) );
 }
 
-int bktr_poll( dev_t dev, int events, struct thread *td)
+static int
+bktr_poll( dev_t dev, int events, struct thread *td)
 {
 	int		unit;
 	bktr_ptr_t	bktr;
diff --git a/sys/dev/ciss/ciss.c b/sys/dev/ciss/ciss.c
index ad4dedc..a49d7db 100644
--- a/sys/dev/ciss/ciss.c
+++ b/sys/dev/ciss/ciss.c
@@ -2479,7 +2479,7 @@ ciss_find_periph(struct ciss_softc *sc, int target)
  *
  * XXX is this strictly correct?
  */
-int
+static int
 ciss_name_device(struct ciss_softc *sc, int target)
 {
     struct cam_periph	*periph;
diff --git a/sys/dev/dgb/dgb.c b/sys/dev/dgb/dgb.c
index c276ed3..35a0696 100644
--- a/sys/dev/dgb/dgb.c
+++ b/sys/dev/dgb/dgb.c
@@ -2124,7 +2124,7 @@ dgbstart(tp)
 #endif
 }
 
-void
+static void
 dgbstop(tp, rw)
 	struct tty	*tp;
 	int		rw;
diff --git a/sys/dev/digi/digi.c b/sys/dev/digi/digi.c
index 7d0f58a..57f6022 100644
--- a/sys/dev/digi/digi.c
+++ b/sys/dev/digi/digi.c
@@ -713,7 +713,7 @@ digi_disc_optim(struct tty *tp, struct termios *t, struct digi_p *port)
 		tp->t_state &= ~TS_CAN_BYPASS_L_RINT;
 }
 
-int
+static int
 digiopen(dev_t dev, int flag, int mode, struct thread *td)
 {
 	struct digi_softc *sc;
@@ -878,7 +878,7 @@ out:
 	return (error);
 }
 
-int
+static int
 digiclose(dev_t dev, int flag, int mode, struct thread *td)
 {
 	int mynor;
@@ -958,7 +958,7 @@ digihardclose(struct digi_p *port)
 	splx(s);
 }
 
-int
+static int
 digiread(dev_t dev, struct uio *uio, int flag)
 {
 	int mynor;
@@ -984,7 +984,7 @@ digiread(dev_t dev, struct uio *uio, int flag)
 	return (error);
 }
 
-int
+static int
 digiwrite(dev_t dev, struct uio *uio, int flag)
 {
 	int mynor;
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c
index 99b355a..d68da1e 100644
--- a/sys/dev/ed/if_ed.c
+++ b/sys/dev/ed/if_ed.c
@@ -1431,7 +1431,7 @@ ed_probe_HP_pclanp(dev, port_rid, flags)
  * HP PC Lan+ : Set the physical link to use AUI or TP/TL.
  */
 
-void
+static void
 ed_hpp_set_physical_link(struct ed_softc *sc)
 {
 	struct ifnet *ifp = &sc->arpcom.ac_if;
@@ -3076,7 +3076,7 @@ ed_hpp_readmem(sc, src, dst, amount)
  *	Only used in the probe routine to test the memory. 'len' must
  *	be even.
  */
-void
+static void
 ed_hpp_writemem(sc, src, dst, len)
 	struct ed_softc *sc;
 	unsigned char *src;
diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c
index 5e4d381..fae210c 100644
--- a/sys/dev/fdc/fdc.c
+++ b/sys/dev/fdc/fdc.c
@@ -1520,7 +1520,7 @@ fd_in(struct fdc_data *fdc, int *ptr)
 #endif	/* FDC_DEBUG */
 }
 
-int
+static int
 out_fdc(struct fdc_data *fdc, int x)
 {
 	int i, j, step;
@@ -1548,7 +1548,7 @@ out_fdc(struct fdc_data *fdc, int x)
  * Block device driver interface functions (interspersed with even more
  * auxiliary functions).
  */
-int
+static int
 Fdopen(dev_t dev, int flags, int mode, struct thread *td)
 {
  	fdu_t fdu = FDUNIT(minor(dev));
@@ -1644,7 +1644,7 @@ Fdopen(dev_t dev, int flags, int mode, struct thread *td)
 	return 0;
 }
 
-int
+static int
 fdclose(dev_t dev, int flags, int mode, struct thread *td)
 {
  	fdu_t fdu = FDUNIT(minor(dev));
@@ -1657,7 +1657,7 @@ fdclose(dev_t dev, int flags, int mode, struct thread *td)
 	return (0);
 }
 
-void
+static void
 fdstrategy(struct bio *bp)
 {
 	long blknum, nblocks;
diff --git a/sys/dev/fe/if_fe.c b/sys/dev/fe/if_fe.c
index f229736..fb2ad57 100644
--- a/sys/dev/fe/if_fe.c
+++ b/sys/dev/fe/if_fe.c
@@ -1162,7 +1162,7 @@ fe_xmit (struct fe_softc *sc)
  *  2) that the IFF_OACTIVE flag is checked before this code is called
  *     (i.e. that the output part of the interface is idle)
  */
-void
+static void
 fe_start (struct ifnet *ifp)
 {
 	struct fe_softc *sc = ifp->if_softc;
diff --git a/sys/dev/ie/if_ie.c b/sys/dev/ie/if_ie.c
index 006311f..b578b45 100644
--- a/sys/dev/ie/if_ie.c
+++ b/sys/dev/ie/if_ie.c
@@ -320,7 +320,7 @@ static struct ie_softc {
 #define PORT ie_softc[unit].port
 #define MEM  ie_softc[unit].iomem
 
-int
+static int
 ieprobe(struct isa_device *dvp)
 {
 	int	ret;
@@ -523,7 +523,7 @@ ee16_shutdown(void *sc, int howto)
 
 /* Taken almost exactly from Rod's if_ix.c. */
 
-int
+static int
 ee16_probe(struct isa_device *dvp)
 {
 	struct ie_softc *sc = &ie_softc[dvp->id_unit];
@@ -733,7 +733,7 @@ ee16_probe(struct isa_device *dvp)
 /*
  * Taken almost exactly from Bill's if_is.c, then modified beyond recognition.
  */
-int
+static int
 ieattach(struct isa_device *dvp)
 {
 	int	factor;
@@ -1557,7 +1557,7 @@ find_ie_mem_size(int unit)
 	return;
 }
 
-void
+static void
 el_reset_586(int unit)
 {
 	outb(PORT + IE507_CTRL, EL_CTRL_RESET);
@@ -1566,13 +1566,13 @@ el_reset_586(int unit)
 	DELAY(100);
 }
 
-void
+static void
 sl_reset_586(int unit)
 {
 	outb(PORT + IEATT_RESET, 0);
 }
 
-void
+static void
 ee16_reset_586(int unit)
 {
 	outb(PORT + IEE16_ECTRL, IEE16_RESET_586);
@@ -1581,25 +1581,25 @@ ee16_reset_586(int unit)
 	DELAY(100);
 }
 
-void
+static void
 el_chan_attn(int unit)
 {
 	outb(PORT + IE507_ATTN, 1);
 }
 
-void
+static void
 sl_chan_attn(int unit)
 {
 	outb(PORT + IEATT_ATTN, 0);
 }
 
-void
+static void
 ee16_chan_attn(int unit)
 {
 	outb(PORT + IEE16_ATTN, 0);
 }
 
-u_short
+static u_short
 ee16_read_eeprom(struct ie_softc *sc, int location)
 {
 	int	ectrl, edata;
@@ -1620,7 +1620,7 @@ ee16_read_eeprom(struct ie_softc *sc, int location)
 	return edata;
 }
 
-void
+static void
 ee16_eeprom_outbits(struct ie_softc *sc, int edata, int count)
 {
 	int	ectrl, i;
@@ -1642,7 +1642,7 @@ ee16_eeprom_outbits(struct ie_softc *sc, int edata, int count)
 	DELAY(1);		/* eeprom data must be held for 0.4 uSec */
 }
 
-int
+static int
 ee16_eeprom_inbits(struct ie_softc *sc)
 {
 	int	ectrl, edata, i;
@@ -1661,7 +1661,7 @@ ee16_eeprom_inbits(struct ie_softc *sc)
 	return (edata);
 }
 
-void
+static void
 ee16_eeprom_clock(struct ie_softc *sc, int state)
 {
 	int	ectrl;
@@ -1683,7 +1683,7 @@ ee16_interrupt_enable(struct ie_softc *sc)
 	DELAY(100);
 }
 
-void
+static void
 sl_read_ether(int unit, unsigned char addr[6])
 {
 	int	i;
diff --git a/sys/dev/iir/iir.c b/sys/dev/iir/iir.c
index 4bcf27f..cb684d9 100644
--- a/sys/dev/iir/iir.c
+++ b/sys/dev/iir/iir.c
@@ -1682,7 +1682,7 @@ iir_intr(void *arg)
     }
 }
 
-int
+static int
 gdt_async_event(struct gdt_softc *gdt, int service)
 {
     struct gdt_ccb *gccb;
@@ -1742,7 +1742,7 @@ gdt_async_event(struct gdt_softc *gdt, int service)
     return (0);
 }
 
-int
+static int
 gdt_sync_event(struct gdt_softc *gdt, int service, 
                u_int8_t index, struct gdt_ccb *gccb)
 {
diff --git a/sys/dev/lge/if_lge.c b/sys/dev/lge/if_lge.c
index 7edc7e9..30feaf9 100644
--- a/sys/dev/lge/if_lge.c
+++ b/sys/dev/lge/if_lge.c
@@ -1054,7 +1054,7 @@ lge_rxeof(sc, cnt)
 	return;
 }
 
-void
+static void
 lge_rxeoc(sc)
 	struct lge_softc	*sc;
 {
diff --git a/sys/dev/mii/pnaphy.c b/sys/dev/mii/pnaphy.c
index 4a51ca3..d29d6a5 100644
--- a/sys/dev/mii/pnaphy.c
+++ b/sys/dev/mii/pnaphy.c
@@ -159,7 +159,7 @@ pnaphy_attach(dev)
 	return(0);
 }
 
-int
+static int
 pnaphy_service(sc, mii, cmd)
 	struct mii_softc *sc;
 	struct mii_data *mii;
diff --git a/sys/dev/mii/rlphy.c b/sys/dev/mii/rlphy.c
index fcf5538..7a18a96 100644
--- a/sys/dev/mii/rlphy.c
+++ b/sys/dev/mii/rlphy.c
@@ -250,7 +250,7 @@ rlphy_service(sc, mii, cmd)
 	return (0);
 }
 
-void
+static void
 rlphy_status(phy)
 	struct mii_softc *phy;
 {
diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c
index 8659a3b..42dbd06 100644
--- a/sys/dev/sio/sio.c
+++ b/sys/dev/sio/sio.c
@@ -1635,7 +1635,7 @@ sioinput(com)
 		outb(com->modem_ctl_port, com->mcr_image |= MCR_RTS);
 }
 
-void
+static void
 siointr(arg)
 	void		*arg;
 {
@@ -3149,7 +3149,7 @@ siocncheckc(dev)
 }
 
 
-int
+static int
 siocngetc(dev)
 	dev_t	dev;
 {
@@ -3176,7 +3176,7 @@ siocngetc(dev)
 	return (c);
 }
 
-void
+static void
 siocnputc(dev, c)
 	dev_t	dev;
 	int	c;
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index 4673c34..51dca11 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -444,7 +444,7 @@ scdevtounit(dev_t dev)
 	return vty/MAXCONS;
 }
 
-int
+static int
 scopen(dev_t dev, int flag, int mode, struct thread *td)
 {
     int unit = scdevtounit(dev);
@@ -503,7 +503,7 @@ scopen(dev_t dev, int flag, int mode, struct thread *td)
     return error;
 }
 
-int
+static int
 scclose(dev_t dev, int flag, int mode, struct thread *td)
 {
     struct tty *tp = dev->si_tty;
@@ -551,7 +551,7 @@ scclose(dev_t dev, int flag, int mode, struct thread *td)
     return(0);
 }
 
-int
+static int
 scread(dev_t dev, struct uio *uio, int flag)
 {
     if (!sc_saver_keyb_only)
@@ -637,7 +637,7 @@ scparam(struct tty *tp, struct termios *t)
     return 0;
 }
 
-int
+static int
 scioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct thread *td)
 {
     int error;
@@ -3359,7 +3359,7 @@ next_code:
     goto next_code;
 }
 
-int
+static int
 scmmap(dev_t dev, vm_offset_t offset, int nprot)
 {
     scr_stat *scp;
diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c
index 4ec27d6..74608a6 100644
--- a/sys/fs/cd9660/cd9660_vfsops.c
+++ b/sys/fs/cd9660/cd9660_vfsops.c
@@ -588,7 +588,7 @@ cd9660_root(mp, vpp)
 /*
  * Get filesystem statistics.
  */
-int
+static int
 cd9660_statfs(mp, sbp, td)
 	struct mount *mp;
 	register struct statfs *sbp;
@@ -631,7 +631,7 @@ struct ifid {
 };
 
 /* ARGSUSED */
-int
+static int
 cd9660_fhtovp(mp, fhp, vpp)
 	register struct mount *mp;
 	struct fid *fhp;
@@ -661,7 +661,7 @@ cd9660_fhtovp(mp, fhp, vpp)
 	return (0);
 }
 
-int
+static int
 cd9660_vget(mp, ino, flags, vpp)
 	struct mount *mp;
 	ino_t ino;
@@ -882,7 +882,7 @@ cd9660_vget_internal(mp, ino, flags, vpp, relocated, isodir)
  * Vnode pointer to File handle
  */
 /* ARGSUSED */
-int
+static int
 cd9660_vptofh(vp, fhp)
 	struct vnode *vp;
 	struct fid *fhp;
diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c
index 6899db7..dfa9486 100644
--- a/sys/fs/cd9660/cd9660_vnops.c
+++ b/sys/fs/cd9660/cd9660_vnops.c
@@ -78,7 +78,7 @@ static int cd9660_strategy(struct vop_strategy_args *);
 /*
  * Setattr call. Only allowed for block and character special devices.
  */
-int
+static int
 cd9660_setattr(ap)
 	struct vop_setattr_args /* {
 		struct vnodeop_desc *a_desc;
@@ -335,7 +335,7 @@ struct isoreaddir {
 	int ncookies;
 };
 
-int
+static int
 iso_uiodir(idp,dp,off)
 	struct isoreaddir *idp;
 	struct dirent *dp;
@@ -367,7 +367,7 @@ iso_uiodir(idp,dp,off)
 	return (0);
 }
 
-int
+static int
 iso_shipdir(idp)
 	struct isoreaddir *idp;
 {
diff --git a/sys/fs/deadfs/dead_vnops.c b/sys/fs/deadfs/dead_vnops.c
index 3245d90..9678379 100644
--- a/sys/fs/deadfs/dead_vnops.c
+++ b/sys/fs/deadfs/dead_vnops.c
@@ -240,7 +240,7 @@ dead_bmap(ap)
  * We have to wait during times when the vnode is
  * in a state of change.
  */
-int
+static int
 chkvnlock(vp)
 	register struct vnode *vp;
 {
diff --git a/sys/fs/fifofs/fifo_vnops.c b/sys/fs/fifofs/fifo_vnops.c
index a7d2f3e..7292e56 100644
--- a/sys/fs/fifofs/fifo_vnops.c
+++ b/sys/fs/fifofs/fifo_vnops.c
@@ -571,7 +571,7 @@ fifo_print(ap)
 /*
  * Return POSIX pathconf information applicable to fifo's.
  */
-int
+static int
 fifo_pathconf(ap)
 	struct vop_pathconf_args /* {
 		struct vnode *a_vp;
diff --git a/sys/fs/specfs/spec_vnops.c b/sys/fs/specfs/spec_vnops.c
index b1575c1..20d44c6 100644
--- a/sys/fs/specfs/spec_vnops.c
+++ b/sys/fs/specfs/spec_vnops.c
@@ -49,12 +49,12 @@
 #include <sys/fcntl.h>
 #include <sys/vmmeter.h>
 #include <sys/tty.h>
-
 #include <vm/vm.h>
 #include <vm/vm_object.h>
 #include <vm/vm_page.h>
 #include <vm/vm_pager.h>
 
+
 static int	spec_advlock(struct vop_advlock_args *);
 static int	spec_bmap(struct vop_bmap_args *);
 static int	spec_close(struct vop_close_args *);
diff --git a/sys/i386/i386/initcpu.c b/sys/i386/i386/initcpu.c
index 7bc83f8..65464c2 100644
--- a/sys/i386/i386/initcpu.c
+++ b/sys/i386/i386/initcpu.c
@@ -489,7 +489,7 @@ init_ppro(void)
  * Initialize BBL_CR_CTL3 (Control register 3: used to configure the
  * L2 cache).
  */
-void
+static void
 init_mendocino(void)
 {
 #ifdef CPU_PPRO2CELERON
diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c
index 1318ebb..57e54c6 100644
--- a/sys/i386/i386/pmap.c
+++ b/sys/i386/i386/pmap.c
@@ -466,7 +466,7 @@ pmap_set_opt(void)
 	}
 }
 
-void *
+static void *
 pmap_allocf(uma_zone_t zone, int bytes, u_int8_t *flags, int wait)
 {
 	*flags = UMA_SLAB_PRIV;
diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c
index cdfc327..444bcf3 100644
--- a/sys/i386/i386/trap.c
+++ b/sys/i386/i386/trap.c
@@ -671,7 +671,7 @@ out:
 	return;
 }
 
-int
+static int
 trap_pfault(frame, usermode, eva)
 	struct trapframe *frame;
 	int usermode;
diff --git a/sys/i386/isa/npx.c b/sys/i386/isa/npx.c
index 29e5f06..bbb7253 100644
--- a/sys/i386/isa/npx.c
+++ b/sys/i386/isa/npx.c
@@ -453,7 +453,7 @@ no_irq13:
 /*
  * Attach routine - announce which it is, and wire into system
  */
-int
+static int
 npx_attach(dev)
 	device_t dev;
 {
diff --git a/sys/isa/fd.c b/sys/isa/fd.c
index 5e4d381..fae210c 100644
--- a/sys/isa/fd.c
+++ b/sys/isa/fd.c
@@ -1520,7 +1520,7 @@ fd_in(struct fdc_data *fdc, int *ptr)
 #endif	/* FDC_DEBUG */
 }
 
-int
+static int
 out_fdc(struct fdc_data *fdc, int x)
 {
 	int i, j, step;
@@ -1548,7 +1548,7 @@ out_fdc(struct fdc_data *fdc, int x)
  * Block device driver interface functions (interspersed with even more
  * auxiliary functions).
  */
-int
+static int
 Fdopen(dev_t dev, int flags, int mode, struct thread *td)
 {
  	fdu_t fdu = FDUNIT(minor(dev));
@@ -1644,7 +1644,7 @@ Fdopen(dev_t dev, int flags, int mode, struct thread *td)
 	return 0;
 }
 
-int
+static int
 fdclose(dev_t dev, int flags, int mode, struct thread *td)
 {
  	fdu_t fdu = FDUNIT(minor(dev));
@@ -1657,7 +1657,7 @@ fdclose(dev_t dev, int flags, int mode, struct thread *td)
 	return (0);
 }
 
-void
+static void
 fdstrategy(struct bio *bp)
 {
 	long blknum, nblocks;
diff --git a/sys/isofs/cd9660/cd9660_vfsops.c b/sys/isofs/cd9660/cd9660_vfsops.c
index 4ec27d6..74608a6 100644
--- a/sys/isofs/cd9660/cd9660_vfsops.c
+++ b/sys/isofs/cd9660/cd9660_vfsops.c
@@ -588,7 +588,7 @@ cd9660_root(mp, vpp)
 /*
  * Get filesystem statistics.
  */
-int
+static int
 cd9660_statfs(mp, sbp, td)
 	struct mount *mp;
 	register struct statfs *sbp;
@@ -631,7 +631,7 @@ struct ifid {
 };
 
 /* ARGSUSED */
-int
+static int
 cd9660_fhtovp(mp, fhp, vpp)
 	register struct mount *mp;
 	struct fid *fhp;
@@ -661,7 +661,7 @@ cd9660_fhtovp(mp, fhp, vpp)
 	return (0);
 }
 
-int
+static int
 cd9660_vget(mp, ino, flags, vpp)
 	struct mount *mp;
 	ino_t ino;
@@ -882,7 +882,7 @@ cd9660_vget_internal(mp, ino, flags, vpp, relocated, isodir)
  * Vnode pointer to File handle
  */
 /* ARGSUSED */
-int
+static int
 cd9660_vptofh(vp, fhp)
 	struct vnode *vp;
 	struct fid *fhp;
diff --git a/sys/isofs/cd9660/cd9660_vnops.c b/sys/isofs/cd9660/cd9660_vnops.c
index 6899db7..dfa9486 100644
--- a/sys/isofs/cd9660/cd9660_vnops.c
+++ b/sys/isofs/cd9660/cd9660_vnops.c
@@ -78,7 +78,7 @@ static int cd9660_strategy(struct vop_strategy_args *);
 /*
  * Setattr call. Only allowed for block and character special devices.
  */
-int
+static int
 cd9660_setattr(ap)
 	struct vop_setattr_args /* {
 		struct vnodeop_desc *a_desc;
@@ -335,7 +335,7 @@ struct isoreaddir {
 	int ncookies;
 };
 
-int
+static int
 iso_uiodir(idp,dp,off)
 	struct isoreaddir *idp;
 	struct dirent *dp;
@@ -367,7 +367,7 @@ iso_uiodir(idp,dp,off)
 	return (0);
 }
 
-int
+static int
 iso_shipdir(idp)
 	struct isoreaddir *idp;
 {
diff --git a/sys/kern/kern_intr.c b/sys/kern/kern_intr.c
index ba270ab..61f6579 100644
--- a/sys/kern/kern_intr.c
+++ b/sys/kern/kern_intr.c
@@ -468,7 +468,7 @@ swi_sched(void *cookie, int flags)
 /*
  * This is the main code for interrupt threads.
  */
-void
+static void
 ithread_loop(void *arg)
 {
 	struct ithd *ithd;		/* our thread context */
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c
index 0b134b1..aed5717 100644
--- a/sys/kern/kern_sig.c
+++ b/sys/kern/kern_sig.c
@@ -1018,7 +1018,7 @@ done2:
  * Common code for kill process group/broadcast kill.
  * cp is calling process.
  */
-int
+static int
 killpg1(td, sig, pgid, all)
 	register struct thread *td;
 	int sig, pgid, all;
diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c
index 57c6be8..cf84cd8 100644
--- a/sys/kern/kern_sysctl.c
+++ b/sys/kern/kern_sysctl.c
@@ -1091,7 +1091,7 @@ sysctl_find_oid(int *name, u_int namelen, struct sysctl_oid **noid,
  * to, and return the resulting error code.
  */
 
-int
+static int
 sysctl_root(SYSCTL_HANDLER_ARGS)
 {
 	struct sysctl_oid *oid;
diff --git a/sys/kern/link_elf.c b/sys/kern/link_elf.c
index ea4f0dd..83fbe17 100644
--- a/sys/kern/link_elf.c
+++ b/sys/kern/link_elf.c
@@ -154,7 +154,7 @@ struct r_debug r_debug;
 /*
  * Function for the debugger to set a breakpoint on to gain control.
  */
-void
+static void
 r_debug_state(struct r_debug *dummy_one __unused,
 	      struct link_map *dummy_two __unused)
 {
@@ -975,7 +975,7 @@ elf_hash(const char *name)
     return h;
 }
 
-int
+static int
 link_elf_lookup_symbol(linker_file_t lf, const char* name, c_linker_sym_t* sym)
 {
     elf_file_t ef = (elf_file_t) lf;
diff --git a/sys/kern/link_elf_obj.c b/sys/kern/link_elf_obj.c
index ea4f0dd..83fbe17 100644
--- a/sys/kern/link_elf_obj.c
+++ b/sys/kern/link_elf_obj.c
@@ -154,7 +154,7 @@ struct r_debug r_debug;
 /*
  * Function for the debugger to set a breakpoint on to gain control.
  */
-void
+static void
 r_debug_state(struct r_debug *dummy_one __unused,
 	      struct link_map *dummy_two __unused)
 {
@@ -975,7 +975,7 @@ elf_hash(const char *name)
     return h;
 }
 
-int
+static int
 link_elf_lookup_symbol(linker_file_t lf, const char* name, c_linker_sym_t* sym)
 {
     elf_file_t ef = (elf_file_t) lf;
diff --git a/sys/kern/subr_diskmbr.c b/sys/kern/subr_diskmbr.c
index 2154f30..3457c01 100644
--- a/sys/kern/subr_diskmbr.c
+++ b/sys/kern/subr_diskmbr.c
@@ -376,7 +376,7 @@ done:
 	return (error);
 }
 
-void
+static void
 mbr_extended(dev, lp, ssp, ext_offset, ext_size, base_ext_offset, nsectors,
 	     ntracks, mbr_offset, level)
 	dev_t	dev;
diff --git a/sys/kern/subr_mbuf.c b/sys/kern/subr_mbuf.c
index d066fe3..b8dc867 100644
--- a/sys/kern/subr_mbuf.c
+++ b/sys/kern/subr_mbuf.c
@@ -332,7 +332,7 @@ static void		 mbuf_init(void *);
  */
 MALLOC_DEFINE(M_MBUF, "mbufmgr", "mbuf subsystem management structures");
 SYSINIT(mbuf, SI_SUB_MBUF, SI_ORDER_FIRST, mbuf_init, NULL)
-void
+static void
 mbuf_init(void *dummy)
 {
 	struct mb_pcpu_list *pcpu_cnt;
diff --git a/sys/kern/subr_witness.c b/sys/kern/subr_witness.c
index 3df0a35..b6cd92a 100644
--- a/sys/kern/subr_witness.c
+++ b/sys/kern/subr_witness.c
@@ -1117,7 +1117,7 @@ isitmydescendant(struct witness *parent, struct witness *child)
 	return (0);
 }
 
-void
+static void
 witness_levelall (void)
 {
 	struct witness_list *list;
diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c
index 5d84154..b74a74b 100644
--- a/sys/kern/sys_generic.c
+++ b/sys/kern/sys_generic.c
@@ -149,7 +149,7 @@ pread(td, uap)
 /*
  * Code common for read and pread
  */
-int
+static int
 dofileread(td, fp, fd, buf, nbyte, offset, flags)
 	struct thread *td;
 	struct file *fp;
diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c
index 17e3bc3..d87eb44 100644
--- a/sys/kern/sys_pipe.c
+++ b/sys/kern/sys_pipe.c
@@ -1154,7 +1154,7 @@ pipe_write(fp, uio, active_cred, flags, td)
 /*
  * we implement a very minimal set of ioctls for compatibility with sockets.
  */
-int
+static int
 pipe_ioctl(fp, cmd, data, active_cred, td)
 	struct file *fp;
 	u_long cmd;
@@ -1216,7 +1216,7 @@ pipe_ioctl(fp, cmd, data, active_cred, td)
 	return (ENOTTY);
 }
 
-int
+static int
 pipe_poll(fp, events, active_cred, td)
 	struct file *fp;
 	int events;
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index e05263d..46d136c 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -3455,7 +3455,7 @@ tryagain:
 }
 
 /* Return pages associated with this buf to the vm system */
-void
+static void
 vm_hold_free_pages(struct buf * bp, vm_offset_t from, vm_offset_t to)
 {
 	vm_offset_t pg;
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index e0b1c4e..56ca7be 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -1654,7 +1654,7 @@ SYSINIT(syncer, SI_SUB_KTHREAD_UPDATE, SI_ORDER_FIRST, kproc_start, &up_kp)
 /*
  * System filesystem synchronizer daemon.
  */
-void
+static void
 sched_sync(void)
 {
 	struct synclist *slp;
diff --git a/sys/net/bpf.c b/sys/net/bpf.c
index 1f9dc4f..ee11748 100644
--- a/sys/net/bpf.c
+++ b/sys/net/bpf.c
@@ -1012,7 +1012,7 @@ bpf_setif(d, ifr)
  * Return true iff the specific operation will not block indefinitely.
  * Otherwise, return false but make a note that a selwakeup() must be done.
  */
-int
+static int
 bpfpoll(dev, events, td)
 	register dev_t dev;
 	int events;
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index 0983724..ee455dd 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -1005,7 +1005,7 @@ ether_ioctl(ifp, command, data)
 	return (error);
 }
 
-int
+static int
 ether_resolvemulti(ifp, llsa, sa)
 	struct ifnet *ifp;
 	struct sockaddr **llsa;
diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c
index 37d351b..40be8d0 100644
--- a/sys/net/rtsock.c
+++ b/sys/net/rtsock.c
@@ -894,7 +894,7 @@ rt_ifannouncemsg(ifp, what)
 /*
  * This is used in dumping the kernel table via sysctl().
  */
-int
+static int
 sysctl_dumpentry(rn, vw)
 	struct radix_node *rn;
 	void *vw;
@@ -933,7 +933,7 @@ sysctl_dumpentry(rn, vw)
 	return (error);
 }
 
-int
+static int
 sysctl_iflist(af, w)
 	int	af;
 	register struct	walkarg *w;
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index e9d1c09..54cd90b 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -1475,7 +1475,7 @@ ip_rtaddr(dst, rt)
  * Save incoming source route for use in replies,
  * to be picked up later by ip_srcroute if the receiver is interested.
  */
-void
+static void
 save_rte(option, dst)
 	u_char *option;
 	struct in_addr dst;
diff --git a/sys/nfsclient/nfs_vfsops.c b/sys/nfsclient/nfs_vfsops.c
index 85350a4..f0c9ee1 100644
--- a/sys/nfsclient/nfs_vfsops.c
+++ b/sys/nfsclient/nfs_vfsops.c
@@ -231,7 +231,7 @@ nfs_convert_diskless(void)
 /*
  * nfs statfs call
  */
-int
+static int
 nfs_statfs(struct mount *mp, struct statfs *sbp, struct thread *td)
 {
 	struct vnode *vp;
diff --git a/sys/ufs/ffs/ffs_softdep.c b/sys/ufs/ffs/ffs_softdep.c
index 3c60df5..9475641 100644
--- a/sys/ufs/ffs/ffs_softdep.c
+++ b/sys/ufs/ffs/ffs_softdep.c
@@ -5532,7 +5532,7 @@ request_cleanup(resource, islocked)
  * Awaken processes pausing in request_cleanup and clear proc_waiting
  * to indicate that there is no longer a timer running.
  */
-void
+static void
 pause_timer(arg)
 	void *arg;
 {
@@ -5841,7 +5841,7 @@ softdep_deallocate_dependencies(bp)
 /*
  * Function to handle asynchronous write errors in the filesystem.
  */
-void
+static void
 softdep_error(func, error)
 	char *func;
 	int error;
diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c
index 7e4e3bf..9ad4f47 100644
--- a/sys/ufs/ffs/ffs_vnops.c
+++ b/sys/ufs/ffs/ffs_vnops.c
@@ -314,7 +314,7 @@ loop:
  * Vnode op for reading.
  */
 /* ARGSUSED */
-int
+static int
 ffs_read(ap)
 	struct vop_read_args /* {
 		struct vnode *a_vp;
@@ -646,7 +646,7 @@ ffs_read(ap)
 /*
  * Vnode op for writing.
  */
-int
+static int
 ffs_write(ap)
 	struct vop_write_args /* {
 		struct vnode *a_vp;
@@ -873,7 +873,7 @@ ffs_write(ap)
 /*
  * get page routine
  */
-int
+static int
 ffs_getpages(ap)
 	struct vop_getpages_args *ap;
 {
@@ -1462,7 +1462,7 @@ ffs_close_ea(struct vnode *vp, int commit, struct ucred *cred, struct thread *td
 /*
  * Vnode extattr transaction commit/abort
  */
-int
+static int
 ffs_openextattr(struct vop_openextattr_args *ap)
 /*
 struct vop_openextattr_args {
@@ -1487,7 +1487,7 @@ struct vop_openextattr_args {
 /*
  * Vnode extattr transaction commit/abort
  */
-int
+static int
 ffs_closeextattr(struct vop_closeextattr_args *ap)
 /*
 struct vop_closeextattr_args {
@@ -1514,7 +1514,7 @@ struct vop_closeextattr_args {
 /*
  * Vnode operation to retrieve a named extended attribute.
  */
-int
+static int
 ffs_getextattr(struct vop_getextattr_args *ap)
 /*
 vop_getextattr {
@@ -1600,7 +1600,7 @@ vop_getextattr {
 /*
  * Vnode operation to set a named attribute.
  */
-int
+static int
 ffs_setextattr(struct vop_setextattr_args *ap)
 /*
 vop_setextattr {
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index 6536a70..1761b70 100644
--- a/sys/ufs/ufs/ufs_vnops.c
+++ b/sys/ufs/ufs/ufs_vnops.c
@@ -183,7 +183,7 @@ ufs_itimes(vp)
 /*
  * Create a regular file
  */
-int
+static int
 ufs_create(ap)
 	struct vop_create_args /* {
 		struct vnode *a_dvp;
@@ -207,7 +207,7 @@ ufs_create(ap)
  * Mknod vnode call
  */
 /* ARGSUSED */
-int
+static int
 ufs_mknod(ap)
 	struct vop_mknod_args /* {
 		struct vnode *a_dvp;
@@ -259,7 +259,7 @@ ufs_mknod(ap)
  * Nothing to do.
  */
 /* ARGSUSED */
-int
+static int
 ufs_open(ap)
 	struct vop_open_args /* {
 		struct vnode *a_vp;
@@ -284,7 +284,7 @@ ufs_open(ap)
  * Update the times on the inode.
  */
 /* ARGSUSED */
-int
+static int
 ufs_close(ap)
 	struct vop_close_args /* {
 		struct vnode *a_vp;
@@ -322,7 +322,7 @@ ufs_close(ap)
 	return (0);
 }
 
-int
+static int
 ufs_access(ap)
 	struct vop_access_args /* {
 		struct vnode *a_vp;
@@ -398,7 +398,7 @@ ufs_access(ap)
 }
 
 /* ARGSUSED */
-int
+static int
 ufs_getattr(ap)
 	struct vop_getattr_args /* {
 		struct vnode *a_vp;
@@ -457,7 +457,7 @@ ufs_getattr(ap)
 /*
  * Set attribute vnode op. called from several syscalls
  */
-int
+static int
 ufs_setattr(ap)
 	struct vop_setattr_args /* {
 		struct vnode *a_vp;
@@ -772,7 +772,7 @@ good:
 	return (0);
 }
 
-int
+static int
 ufs_remove(ap)
 	struct vop_remove_args /* {
 		struct vnode *a_dvp;
@@ -803,7 +803,7 @@ out:
 /*
  * link vnode call
  */
-int
+static int
 ufs_link(ap)
 	struct vop_link_args /* {
 		struct vnode *a_tdvp;
@@ -864,7 +864,7 @@ out:
 /*
  * whiteout vnode call
  */
-int
+static int
 ufs_whiteout(ap)
 	struct vop_whiteout_args /* {
 		struct vnode *a_dvp;
@@ -940,7 +940,7 @@ ufs_whiteout(ap)
  *    is different from the source, patch the ".." entry in the
  *    directory.
  */
-int
+static int
 ufs_rename(ap)
 	struct vop_rename_args  /* {
 		struct vnode *a_fdvp;
@@ -1329,7 +1329,7 @@ out:
 /*
  * Mkdir system call
  */
-int
+static int
 ufs_mkdir(ap)
 	struct vop_mkdir_args /* {
 		struct vnode *a_dvp;
@@ -1638,7 +1638,7 @@ out:
 /*
  * Rmdir system call.
  */
-int
+static int
 ufs_rmdir(ap)
 	struct vop_rmdir_args /* {
 		struct vnode *a_dvp;
@@ -1739,7 +1739,7 @@ out:
 /*
  * symlink -- make a symbolic link
  */
-int
+static int
 ufs_symlink(ap)
 	struct vop_symlink_args /* {
 		struct vnode *a_dvp;
@@ -1894,7 +1894,7 @@ ufs_readdir(ap)
 /*
  * Return target name of a symbolic link
  */
-int
+static int
 ufs_readlink(ap)
 	struct vop_readlink_args /* {
 		struct vnode *a_vp;
@@ -1922,7 +1922,7 @@ ufs_readlink(ap)
  * In order to be able to swap to a file, the ufs_bmaparray() operation may not
  * deadlock on memory.  See ufs_bmap() for details.
  */
-int
+static int
 ufs_strategy(ap)
 	struct vop_strategy_args /* {
 		struct vnode *a_vp;
@@ -1963,7 +1963,7 @@ ufs_strategy(ap)
 /*
  * Print out the contents of an inode.
  */
-int
+static int
 ufs_print(ap)
 	struct vop_print_args /* {
 		struct vnode *a_vp;
@@ -1983,7 +1983,7 @@ ufs_print(ap)
 /*
  * Read wrapper for special devices.
  */
-int
+static int
 ufsspec_read(ap)
 	struct vop_read_args /* {
 		struct vnode *a_vp;
@@ -2012,7 +2012,7 @@ ufsspec_read(ap)
 /*
  * Write wrapper for special devices.
  */
-int
+static int
 ufsspec_write(ap)
 	struct vop_write_args /* {
 		struct vnode *a_vp;
@@ -2039,7 +2039,7 @@ ufsspec_write(ap)
  *
  * Update the times on the inode then do device close.
  */
-int
+static int
 ufsspec_close(ap)
 	struct vop_close_args /* {
 		struct vnode *a_vp;
@@ -2060,7 +2060,7 @@ ufsspec_close(ap)
 /*
  * Read wrapper for fifos.
  */
-int
+static int
 ufsfifo_read(ap)
 	struct vop_read_args /* {
 		struct vnode *a_vp;
@@ -2086,7 +2086,7 @@ ufsfifo_read(ap)
 /*
  * Write wrapper for fifos.
  */
-int
+static int
 ufsfifo_write(ap)
 	struct vop_write_args /* {
 		struct vnode *a_vp;
@@ -2113,7 +2113,7 @@ ufsfifo_write(ap)
  *
  * Update the times on the inode then do device close.
  */
-int
+static int
 ufsfifo_close(ap)
 	struct vop_close_args /* {
 		struct vnode *a_vp;
@@ -2136,7 +2136,7 @@ ufsfifo_close(ap)
  *
  * Fall through to ufs kqfilter routines if needed 
  */
-int
+static int
 ufsfifo_kqfilter(ap)
 	struct vop_kqfilter_args *ap;
 {
@@ -2151,7 +2151,7 @@ ufsfifo_kqfilter(ap)
 /*
  * Return POSIX pathconf information applicable to ufs filesystems.
  */
-int
+static int
 ufs_pathconf(ap)
 	struct vop_pathconf_args /* {
 		struct vnode *a_vp;
@@ -2188,7 +2188,7 @@ ufs_pathconf(ap)
 /*
  * Advisory record locking support
  */
-int
+static int
 ufs_advlock(ap)
 	struct vop_advlock_args /* {
 		struct vnode *a_vp;
@@ -2251,7 +2251,7 @@ ufs_vinit(mntp, specops, fifoops, vpp)
  * Allocate a new inode.
  * Vnode dvp must be locked.
  */
-int
+static int
 ufs_makeinode(mode, dvp, vpp, cnp)
 	int mode;
 	struct vnode *dvp;
diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c
index b844d02..caf3bd9 100644
--- a/sys/vm/swap_pager.c
+++ b/sys/vm/swap_pager.c
@@ -1979,7 +1979,7 @@ vm_pager_chain_iodone(struct buf *nbp)
  *	I/O completes, the parent buffer will be B_SIGNAL'd.  Errors are
  *	automatically propagated to the parent
  */
-struct buf *
+static struct buf *
 getchainbuf(struct bio *bp, struct vnode *vp, int flags)
 {
 	struct buf *nbp;
@@ -2007,7 +2007,7 @@ getchainbuf(struct bio *bp, struct vnode *vp, int flags)
 	return (nbp);
 }
 
-void
+static void
 flushchainbuf(struct buf *nbp)
 {
 	GIANT_REQUIRED;
diff --git a/sys/vm/uma_core.c b/sys/vm/uma_core.c
index 099ea42..a639481 100644
--- a/sys/vm/uma_core.c
+++ b/sys/vm/uma_core.c
@@ -330,7 +330,7 @@ zone_timeout(uma_zone_t zone)
  * Returns:
  *	1 on sucess and 0 on failure.
  */
-int
+static int
 hash_alloc(struct uma_hash *hash)
 {
 	int oldsize;
diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c
index 3b09a4b..34a5e70 100644
--- a/sys/vm/vm_glue.c
+++ b/sys/vm/vm_glue.c
@@ -269,7 +269,7 @@ vm_proc_dispose(struct proc *p)
 /*
  * Allow the U area for a process to be prejudicially paged out.
  */
-void
+static void
 vm_proc_swapout(struct proc *p)
 {
 	vm_object_t upobj;
@@ -292,7 +292,7 @@ vm_proc_swapout(struct proc *p)
 /*
  * Bring the U area for a specified process back in.
  */
-void
+static void
 vm_proc_swapin(struct proc *p)
 {
 	vm_page_t ma[UAREA_PAGES];
diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c
index d47cb7c..eb199a3 100644
--- a/sys/vm/vnode_pager.c
+++ b/sys/vm/vnode_pager.c
@@ -92,7 +92,7 @@ struct pagerops vnodepagerops = {
 
 int vnode_pbuf_freecnt;
 
-void
+static void
 vnode_pager_init(void)
 {