103 files changed, 299 insertions, 412 deletions

diff --git a/sys/alpha/linux/linux_sysvec.c b/sys/alpha/linux/linux_sysvec.c
index 0630156521d7..07abfbee29be 100644
--- a/sys/alpha/linux/linux_sysvec.c
+++ b/sys/alpha/linux/linux_sysvec.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_sysvec.c,v 1.4 1996/03/17 14:31:58 peter Exp $
+ *  $Id: linux_sysvec.c,v 1.5 1996/05/01 06:31:18 jkh Exp $
  */
 
 /* XXX we use functions that might not exist. */
@@ -361,7 +361,6 @@ linux_sigreturn(p, args, retval)
 void
 linux_prepsyscall(struct trapframe *tf, int *args, u_int *code, caddr_t *params)
 {
-	int i;
 	args[0] = tf->tf_ebx;
 	args[1] = tf->tf_ecx;
 	args[2] = tf->tf_edx;
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c
index c96196da63bc..46cf1a8c2d4c 100644
--- a/sys/amd64/amd64/pmap.c
+++ b/sys/amd64/amd64/pmap.c
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)pmap.c	7.7 (Berkeley)	5/12/91
- *	$Id: pmap.c,v 1.101 1996/06/07 02:36:08 dyson Exp $
+ *	$Id: pmap.c,v 1.102 1996/06/08 06:48:27 dyson Exp $
  */
 
 /*
@@ -725,7 +725,6 @@ pmap_release(pmap)
 {
 	vm_page_t p,n,ptdpg;
 	vm_object_t object = pmap->pm_pteobj;
-	int s;
 
 	if (object->ref_count != 1)
 		panic("pmap_release: pteobj reference count != 1");
@@ -1172,8 +1171,6 @@ pmap_remove_pte_mapping(pa)
 {
 	register pv_entry_t pv, *ppv, npv;
 	register unsigned *pte;
-	vm_offset_t va;
-	int anyvalid = 0;
 
 	ppv = pa_to_pvh(pa);
 
@@ -1289,8 +1286,6 @@ pmap_protect(pmap, sva, eva, prot)
 	vm_offset_t sva, eva;
 	vm_prot_t prot;
 {
-	register unsigned *pte;
-	register vm_offset_t va;
 	register unsigned *ptbase;
 	vm_offset_t pdnxt;
 	vm_offset_t ptpaddr;
diff --git a/sys/amd64/amd64/sys_machdep.c b/sys/amd64/amd64/sys_machdep.c
index 411cf675d280..f82b3f1ec542 100644
--- a/sys/amd64/amd64/sys_machdep.c
+++ b/sys/amd64/amd64/sys_machdep.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)sys_machdep.c	5.5 (Berkeley) 1/19/91
- *	$Id: sys_machdep.c,v 1.14 1996/01/03 21:41:32 wollman Exp $
+ *	$Id: sys_machdep.c,v 1.15 1996/03/03 01:57:44 jkh Exp $
  *
  */
 
@@ -185,8 +185,6 @@ i386_set_ldt(p, args, retval)
 	int error = 0, i, n;
  	int largest_ld;
 	struct pcb *pcb = &p->p_addr->u_pcb;
- 	union descriptor desc;
-	union descriptor *lp;
 	int s;
 	struct i386_set_ldt_args ua, *uap;
 
diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c
index b81cfc10601b..7cf89d17dce2 100644
--- a/sys/amd64/amd64/trap.c
+++ b/sys/amd64/amd64/trap.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)trap.c	7.4 (Berkeley) 5/13/91
- *	$Id: trap.c,v 1.75 1996/03/28 05:40:57 dyson Exp $
+ *	$Id: trap.c,v 1.76 1996/05/18 03:36:19 dyson Exp $
  */
 
 /*
@@ -606,9 +606,6 @@ trap_pfault(frame, usermode)
 		ftype = VM_PROT_READ;
 
 	if (map != kernel_map) {
-		vm_offset_t v;
-		vm_page_t mpte;
-
 		/*
 		 * Keep swapout from messing with us during this
 		 *	critical time.
diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c
index 9c9c6688d5b8..821d84498bdc 100644
--- a/sys/compat/linux/linux_ioctl.c
+++ b/sys/compat/linux/linux_ioctl.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_ioctl.c,v 1.8 1996/03/04 11:15:19 peter Exp $
+ *  $Id: linux_ioctl.c,v 1.9 1996/03/10 22:30:53 peter Exp $
  */
 
 #include <sys/param.h>
@@ -122,7 +122,7 @@ static void
 bsd_to_linux_termios(struct termios *bsd_termios, 
 		struct linux_termios *linux_termios)
 {
-    int i, speed;
+    int i;
 
 #ifdef DEBUG
     printf("LINUX: BSD termios structure (input):\n");
@@ -263,7 +263,7 @@ static void
 linux_to_bsd_termios(struct linux_termios *linux_termios,
 		struct termios *bsd_termios)
 {
-    int i, speed;
+    int i;
 #ifdef DEBUG
     printf("LINUX: LINUX termios structure (input):\n");
     printf("i=%08x o=%08x c=%08x l=%08x line=%d\n",
@@ -451,10 +451,8 @@ int
 linux_ioctl(struct proc *p, struct linux_ioctl_args *args, int *retval)
 {
     struct termios bsd_termios;
-    struct winsize bsd_winsize;
     struct linux_termios linux_termios;
     struct linux_termio linux_termio;
-    struct linux_winsize linux_winsize;
     struct filedesc *fdp = p->p_fd;
     struct file *fp;
     int (*func)(struct file *fp, int com, caddr_t data, struct proc *p);
diff --git a/sys/compat/linux/linux_ipc.c b/sys/compat/linux/linux_ipc.c
index 854766b99cc8..72ebd20abd7c 100644
--- a/sys/compat/linux/linux_ipc.c
+++ b/sys/compat/linux/linux_ipc.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_ipc.c,v 1.6 1996/01/08 04:34:54 peter Exp $
+ *  $Id: linux_ipc.c,v 1.7 1996/03/02 19:37:56 peter Exp $
  */
 
 
@@ -44,7 +44,6 @@ static int linux_semget __P((struct proc *, struct linux_ipc_args *, int *));
 static int linux_semctl __P((struct proc *, struct linux_ipc_args *, int *));
 static int linux_msgsnd __P((struct proc *, struct linux_ipc_args *, int *));
 static int linux_msgrcv __P((struct proc *, struct linux_ipc_args *, int *));
-static int linux_msgop __P((struct proc *, struct linux_ipc_args *, int *));
 static int linux_msgctl __P((struct proc *, struct linux_ipc_args *, int *));
 static int linux_shmat __P((struct proc *, struct linux_ipc_args *, int *));
 static int linux_shmdt __P((struct proc *, struct linux_ipc_args *, int *));
diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c
index 61127711d81f..f412cf0bcf02 100644
--- a/sys/compat/linux/linux_misc.c
+++ b/sys/compat/linux/linux_misc.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_misc.c,v 1.18 1996/04/07 17:38:49 bde Exp $
+ *  $Id: linux_misc.c,v 1.19 1996/05/02 10:43:13 phk Exp $
  */
 
 #include <sys/param.h>
@@ -166,7 +166,6 @@ linux_uselib(struct proc *p, struct linux_uselib_args *args, int *retval)
     unsigned long file_offset;
     vm_offset_t buffer;
     unsigned long bss_size;
-    char *ptr;
     int error;
     caddr_t sg;
     int locked;
@@ -683,7 +682,7 @@ linux_times(struct proc *p, struct linux_times_args *args, int *retval)
     struct timeval tv;
     struct linux_times_argv tms;
     struct rusage ru;
-    int error, s;
+    int error;
 
 #ifdef DEBUG
     printf("Linux-emul(%d): times(*)\n", p->p_pid);
diff --git a/sys/dev/ccd/ccd.c b/sys/dev/ccd/ccd.c
index f56b78bb431d..05451a987881 100644
--- a/sys/dev/ccd/ccd.c
+++ b/sys/dev/ccd/ccd.c
@@ -1,4 +1,4 @@
-/* $Id: ccd.c,v 1.11 1996/05/13 08:38:15 asami Exp $ */
+/* $Id: ccd.c,v 1.12 1996/05/13 09:17:42 asami Exp $ */
 
 /*	$NetBSD: ccd.c,v 1.22 1995/12/08 19:13:26 thorpej Exp $	*/
 
@@ -215,7 +215,9 @@ static	void ccdmakedisklabel __P((struct ccd_softc *));
 static	int ccdlock __P((struct ccd_softc *));
 static	void ccdunlock __P((struct ccd_softc *));
 
+#ifdef CCD_DEBUG
 static	void loopdelay __P((void));
+#endif
 
 #ifdef DEBUG
 static	void printiinfo __P((struct ccdiinfo *));
@@ -701,8 +703,7 @@ ccdstrategy(bp)
 {
 	register int unit = ccdunit(bp->b_dev);
 	register struct ccd_softc *cs = &ccd_softc[unit];
-	register daddr_t bn;
-	register int sz, s;
+	register int s;
 	int wlabel;
 	struct disklabel *lp;
 
@@ -1076,6 +1077,7 @@ ccdwrite(dev, uio, flags)
 	return (physio(ccdstrategy, NULL, dev, B_WRITE, minphys, uio));
 }
 
+#ifdef CCD_DEBUG
 static void
 loopdelay()
 {
@@ -1087,6 +1089,7 @@ loopdelay()
 			for (k = 0; k < 100; k++)
 				l = i * j * k;
 }
+#endif
 
 int
 ccdioctl(dev, cmd, data, flag, p)
@@ -1480,14 +1483,9 @@ ccdgetdisklabel(dev)
 	struct ccd_softc *cs = &ccd_softc[unit];
 	char *errstring;
 	struct disklabel *lp = &cs->sc_dkdev.dk_label;
-/*	struct cpu_disklabel *clp = &cs->sc_dkdev.dk_cpulabel; */
 	struct ccdgeom *ccg = &cs->sc_geom;
 
-	struct dos_partition dos_partdummy;
-	struct dkbad dkbaddummy;
-
 	bzero(lp, sizeof(*lp));
-/*	bzero(clp, sizeof(*clp)); */
 
 	lp->d_secperunit = cs->sc_size;
 	lp->d_secsize = ccg->ccg_secsize;
@@ -1519,8 +1517,7 @@ ccdgetdisklabel(dev)
 	 * Call the generic disklabel extraction routine.
 	 */
 	if (errstring = readdisklabel(CCDLABELDEV(dev), ccdstrategy,
-	    &cs->sc_dkdev.dk_label/*, &dos_partdummy, &dkbaddummy*/)) 
-		/*, &cs->sc_dkdev.dk_cpulabel)) */
+	    &cs->sc_dkdev.dk_label))
 		ccdmakedisklabel(cs);
 
 #ifdef DEBUG
diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c
index 5ebc51a1d392..a4b80346b350 100644
--- a/sys/dev/cy/cy.c
+++ b/sys/dev/cy/cy.c
@@ -27,7 +27,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cy.c,v 1.31 1996/03/27 20:03:23 bde Exp $
+ *	$Id: cy.c,v 1.32 1996/05/02 09:34:34 phk Exp $
  */
 
 #include "cy.h"
@@ -343,7 +343,9 @@ static	int	sioattach	__P((struct isa_device *dev));
 static	void	cd1400_channel_cmd __P((cy_addr iobase, int cmd));
 static	timeout_t siodtrwakeup;
 static	void	comhardclose	__P((struct com_s *com));
+#if 0
 static	void	siointr1	__P((struct com_s *com));
+#endif
 static	int	commctl		__P((struct com_s *com, int bits, int how));
 static	int	comparam	__P((struct tty *tp, struct termios *t));
 static	int	sioprobe	__P((struct isa_device *dev));
@@ -1352,11 +1354,13 @@ cont:
 	schedsofttty();
 }
 
+#if 0
 static void
 siointr1(com)
 	struct com_s	*com;
 {
 }
+#endif
 
 static int
 sioioctl(dev, cmd, data, flag, p)
diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c
index 5ebc51a1d392..a4b80346b350 100644
--- a/sys/dev/cy/cy_isa.c
+++ b/sys/dev/cy/cy_isa.c
@@ -27,7 +27,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cy.c,v 1.31 1996/03/27 20:03:23 bde Exp $
+ *	$Id: cy.c,v 1.32 1996/05/02 09:34:34 phk Exp $
  */
 
 #include "cy.h"
@@ -343,7 +343,9 @@ static	int	sioattach	__P((struct isa_device *dev));
 static	void	cd1400_channel_cmd __P((cy_addr iobase, int cmd));
 static	timeout_t siodtrwakeup;
 static	void	comhardclose	__P((struct com_s *com));
+#if 0
 static	void	siointr1	__P((struct com_s *com));
+#endif
 static	int	commctl		__P((struct com_s *com, int bits, int how));
 static	int	comparam	__P((struct tty *tp, struct termios *t));
 static	int	sioprobe	__P((struct isa_device *dev));
@@ -1352,11 +1354,13 @@ cont:
 	schedsofttty();
 }
 
+#if 0
 static void
 siointr1(com)
 	struct com_s	*com;
 {
 }
+#endif
 
 static int
 sioioctl(dev, cmd, data, flag, p)
diff --git a/sys/dev/dgb/dgb.c b/sys/dev/dgb/dgb.c
index a73fb5353cdf..243c42453832 100644
--- a/sys/dev/dgb/dgb.c
+++ b/sys/dev/dgb/dgb.c
@@ -1,5 +1,5 @@
 /*-
- *  dgb.c $Id: dgb.c,v 1.16 1996/03/28 14:27:26 scrappy Exp $
+ *  dgb.c $Id: dgb.c,v 1.17 1996/03/29 11:39:08 bde Exp $
  *
  *  Digiboard driver.
  *
@@ -168,7 +168,6 @@ static struct tty dgb_tty[NDGBPORTS];
  */
 
 /* Interrupt handling entry points. */
-static void	dgbintr		__P((int unit));
 static void	dgbpoll		__P((void *unit_c));
 
 /* Device switch entry points. */
@@ -211,8 +210,6 @@ static struct cdevsw dgb_cdevsw =
 	  ttselect,	nommap,		NULL,	"dgb",	NULL,	-1 };
 
 static	speed_t	dgbdefaultrate = TTYDEF_SPEED;
-static	u_int	dgb_events;	/* input chars + weighted output completions */
-static	int	dgbmajor;
 
 static	struct speedtab dgbspeedtab[] = {
 	0,	0, /* old (sysV-like) Bx codes */
@@ -240,9 +237,6 @@ static int dgbdebug=0;
 SYSCTL_INT(_debug, OID_AUTO, dgb_debug, CTLFLAG_RW,
 	&dgbdebug, 0, "");
 
-
-static int polltimeout=0;
-
 static int setwin __P((struct dgb_softc *sc, unsigned addr));
 static int setinitwin __P((struct dgb_softc *sc, unsigned addr));
 static void hidewin __P((struct dgb_softc *sc));
@@ -305,10 +299,8 @@ dgbprobe(dev)
 	struct isa_device	*dev;
 {
 	struct dgb_softc *sc= &dgb_softc[dev->id_unit];
-	int i, v, t;
+	int i, v;
 	u_long win_size;  /* size of vizible memory window */
-	u_char *mem;
-	int addr;
 	int unit=dev->id_unit;
 
 	sc->unit=dev->id_unit;
@@ -451,7 +443,6 @@ dgbattach(dev)
 	int addr;
 	struct dgb_p *port;
 	struct board_chan *bc;
-	struct global_data *gd;
 	int shrinkmem;
 	int nfails;
 	ushort *pstat;
@@ -1127,7 +1118,6 @@ dgbhardclose(port)
 {
 	struct dgb_softc *sc=&dgb_softc[port->unit];
 	struct board_chan *bc=port->brdchan;
-	int s;
 
 	setwin(sc,0);
 
@@ -1424,12 +1414,6 @@ dgbpoll(unit_c)
 	timeout(dgbpoll, unit_c, hz/25);
 }
 
-static void
-dgbintr(unit)
-	int	unit;
-{
-}
-
 static	int
 dgbioctl(dev, cmd, data, flag, p)
 	dev_t		dev;
@@ -1680,7 +1664,6 @@ static int
 dgbdrain(port)
 	struct dgb_p	*port;
 {
-	struct tty *tp=port->tty;
 	struct dgb_softc *sc=&dgb_softc[port->unit];
 	struct board_chan *bc=port->brdchan;
 	int error;
@@ -1787,7 +1770,6 @@ dgbparam(tp, t)
 	struct termios	*t;
 {
 	int dev=tp->t_dev;
-	int mynor=minor(dev);
 	int unit=MINOR_TO_UNIT(dev);
 	int pnum=MINOR_TO_PORT(dev);
 	struct dgb_softc *sc=&dgb_softc[unit];
diff --git a/sys/dev/dgb/dgreg.h b/sys/dev/dgb/dgreg.h
index 93f327dace1f..3864d070455f 100644
--- a/sys/dev/dgb/dgreg.h
+++ b/sys/dev/dgb/dgreg.h
@@ -1,5 +1,5 @@
 /*-
- *  dgreg.h $Id: dgreg.h,v 1.2 1995/10/04 21:51:26 jkh Exp $
+ *  dgreg.h $Id: dgreg.h,v 1.3 1995/12/22 16:08:15 bde Exp $
  *
  *  Digiboard driver.
  *
@@ -253,7 +253,7 @@ struct board_chan {
 #define PCXE    1
 #define	PCXEVE	2
 
-static char *board_desc[] = {
+static char * const board_desc[] = {
 	"PC/Xi (64K)",
 	"PC/Xe (64K)",
 	"PC/Xe (8K) ",
diff --git a/sys/dev/eisa/eisaconf.c b/sys/dev/eisa/eisaconf.c
index 37f1697e182d..7a719107e36f 100644
--- a/sys/dev/eisa/eisaconf.c
+++ b/sys/dev/eisa/eisaconf.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: eisaconf.c,v 1.18 1996/04/07 17:03:12 bde Exp $
+ *	$Id: eisaconf.c,v 1.19 1996/04/20 21:21:49 gibbs Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -673,8 +673,6 @@ eisa_registerdev(e_dev, driver, kdc_template)
 	struct eisa_driver *driver;
 	struct kern_devconf *kdc_template;
 {
-	resvaddr_t *node;
-
 	e_dev->driver = driver;	/* Driver now owns this device */
 	e_dev->kdc = (struct kern_devconf *)malloc(sizeof(struct kern_devconf),
 						   M_DEVBUF, M_NOWAIT);
diff --git a/sys/dev/ep/if_ep.c b/sys/dev/ep/if_ep.c
index aecba9b215ed..a6a24df2ca85 100644
--- a/sys/dev/ep/if_ep.c
+++ b/sys/dev/ep/if_ep.c
@@ -38,7 +38,7 @@
  */
 
 /*
- *  $Id: if_ep.c,v 1.43 1996/02/28 17:19:03 gibbs Exp $
+ *  $Id: if_ep.c,v 1.44 1996/05/24 15:22:36 gibbs Exp $
  *
  *  Promiscuous mode added and interrupt logic slightly changed
  *  to reduce the number of adapter failures. Transceiver select
@@ -196,7 +196,7 @@ static struct ep_board *
 ep_look_for_board_at(is)
     struct isa_device *is;
 {
-    int data, i, j, io_base, id_port = ELINK_ID_PORT;
+    int data, i, j, id_port = ELINK_ID_PORT;
     int count = 0;
 
     if (ep_current_tag == (EP_LAST_TAG + 1)) {
@@ -364,7 +364,6 @@ ep_isa_probe(is)
     struct ep_softc *sc;
     struct ep_board *epb;
     u_short k;
-    int i;
 
     if(( epb=ep_look_for_board_at(is) )==0)
 	return (0);
@@ -573,7 +572,7 @@ epinit(sc)
     struct ep_softc *sc;
 {
     register struct ifnet *ifp = &sc->arpcom.ac_if;
-    int s, i, j;
+    int s, i;
 
 	/*
     if (ifp->if_addrlist == (struct ifaddr *) 0)
diff --git a/sys/dev/ep/if_ep_eisa.c b/sys/dev/ep/if_ep_eisa.c
index bd1955f75f01..43b317d7b88c 100644
--- a/sys/dev/ep/if_ep_eisa.c
+++ b/sys/dev/ep/if_ep_eisa.c
@@ -19,7 +19,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- *	$Id: 3c5x9.c,v 1.1 1996/02/26 01:01:37 gibbs Exp $
+ *	$Id: 3c5x9.c,v 1.2 1996/02/28 17:18:55 gibbs Exp $
  */
 
 #include "eisa.h"
@@ -127,7 +127,6 @@ ep_eisa_probe(void)
 {
 	u_long iobase;
 	struct eisa_device *e_dev = NULL;
-	int stat = 0;
 	int count;
 
 	count = 0;
@@ -204,7 +203,6 @@ ep_eisa_attach(e_dev)
 	resvaddr_t *ioport;
 	resvaddr_t *eisa_ioport;
 	u_char level_intr;
-	u_short conf;
 	int i;
 
 	/*
diff --git a/sys/dev/fe/if_fe.c b/sys/dev/fe/if_fe.c
index 073379f60355..eb7ec898f770 100644
--- a/sys/dev/fe/if_fe.c
+++ b/sys/dev/fe/if_fe.c
@@ -21,7 +21,7 @@
  */
 
 /*
- * $Id: if_fe.c,v 1.13 1996/04/07 17:50:09 bde Exp $
+ * $Id: if_fe.c,v 1.14 1996/04/23 18:36:55 nate Exp $
  *
  * Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
  * To be used with FreeBSD 2.x
@@ -2632,7 +2632,6 @@ fe_write_mbufs ( struct fe_softc *sc, struct mbuf *m )
 {
 	u_short addr_bmpr8 = sc->ioaddr[ FE_BMPR8 ];
 	u_short length, len;
-	short pad;
 	struct mbuf *mp;
 	u_char *data;
 	u_short savebyte;	/* WARNING: Architecture dependent!  */
diff --git a/sys/dev/lnc/if_lnc.c b/sys/dev/lnc/if_lnc.c
index 3e060a405617..46afc70409e8 100644
--- a/sys/dev/lnc/if_lnc.c
+++ b/sys/dev/lnc/if_lnc.c
@@ -126,7 +126,9 @@ static struct lnc_softc {
 	LNCSTATS_STRUCT
 } lnc_softc[NLNC];
 
+#ifdef LNC_MULTICAST
 static void lnc_setladrf __P((struct lnc_softc *sc));
+#endif
 static void lnc_stop __P((int unit));
 static void lnc_reset __P((int unit));
 static void lnc_free_mbufs __P((struct lnc_softc *sc));
diff --git a/sys/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c
index 96eccecade64..f13b72a43539 100644
--- a/sys/dev/mcd/mcd.c
+++ b/sys/dev/mcd/mcd.c
@@ -40,9 +40,9 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: mcd.c,v 1.78 1996/05/03 16:49:02 phk Exp $
+ *	$Id: mcd.c,v 1.79 1996/06/08 09:18:21 bde Exp $
  */
-static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
+static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 
 #include "mcd.h"
 #if NMCD > 0
diff --git a/sys/dev/rc/rc.c b/sys/dev/rc/rc.c
index d05b42359729..b9bd2c410bfa 100644
--- a/sys/dev/rc/rc.c
+++ b/sys/dev/rc/rc.c
@@ -152,7 +152,7 @@ static int rc_scheduled_event = 0;
 
 /* for pstat -t */
 static struct tty rc_tty[NRC * CD180_NCHAN];
-static int        nrc_tty = NRC * CD180_NCHAN;
+static const int  nrc_tty = NRC * CD180_NCHAN;
 
 /* Flags */
 #define RC_DTR_OFF      0x0001          /* DTR wait, for close/open     */
@@ -258,7 +258,7 @@ static int
 rcattach(dvp)
 	struct  isa_device      *dvp;
 {
-	register int            i, chan, nec = dvp->id_iobase;
+	register int            chan, nec = dvp->id_iobase;
 	struct rc_softc         *rcb = &rc_softc[dvp->id_unit];
 	struct rc_chans         *rc  = &rc_chans[dvp->id_unit * CD180_NCHAN];
 	static int              rc_wakeup_started = 0;
@@ -595,9 +595,8 @@ void rcpoll()
 	register struct rc_chans *rc;
 	register struct rc_softc *rcb;
 	register u_char        *tptr, *eptr;
-	register int            s;
 	register struct tty    *tp;
-	register int            chan, icnt, c, nec, unit;
+	register int            chan, icnt, nec, unit;
 
 	if (rc_scheduled_event == 0)
 		return;
@@ -1110,7 +1109,7 @@ static void rc_reinit(rcb)
 struct rc_softc         *rcb;
 {
 	register struct rc_chans       *rc, *rce;
-	register int                    i, nec;
+	register int                    nec;
 
 	nec = rcb->rcb_addr;
 	rc_hwreset(rcb->rcb_unit, nec, RC_FAKEID);
@@ -1272,7 +1271,7 @@ int rc_test(nec, unit)
 	register int    nec;
 	int             unit;
 {
-	int     chan = 0, nopt = 0;
+	int     chan = 0;
 	int     i = 0, rcnt, old_level;
 	unsigned int    iack, chipid;
 	unsigned short  divs;
@@ -1482,8 +1481,6 @@ static void
 rc_wakeup(chan)
 	void	*chan;
 {
-	int		unit;
-
 	timeout(rc_wakeup, (caddr_t)NULL, 1);
 
 	if (rc_scheduled_event != 0) {
diff --git a/sys/dev/si/si.c b/sys/dev/si/si.c
index b9498c47b5fd..076f12eb7431 100644
--- a/sys/dev/si/si.c
+++ b/sys/dev/si/si.c
@@ -30,13 +30,13 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- *	$Id: si.c,v 1.41 1996/05/30 23:41:35 peter Exp $
+ *	$Id: si.c,v 1.42 1996/06/08 10:18:12 peter Exp $
  */
 
 #ifndef lint
-static char si_copyright1[] =  "@(#) (C) Specialix International, 1990,1992",
-            si_copyright2[] =  "@(#) (C) Andy Rutter 1993",
-            si_copyright3[] =  "@(#) (C) Peter Wemm 1995";
+static const char si_copyright1[] =  "@(#) (C) Specialix International, 1990,1992",
+                  si_copyright2[] =  "@(#) (C) Andy Rutter 1993",
+                  si_copyright3[] =  "@(#) (C) Peter Wemm 1995";
 #endif	/* not lint */
 
 #include <sys/param.h>
@@ -234,7 +234,6 @@ static int si_pollrate;			/* in addition to irq */
 SYSCTL_INT(_machdep, OID_AUTO, si_pollrate, CTLFLAG_RD, &si_pollrate, 0, "");
 		 
 static int init_finished = 0;
-static int fastpoll = 0;
 static void si_poll __P((void *));
 #endif
 
@@ -494,9 +493,6 @@ siattach(id)
 	struct speedtab *spt;
 	int nmodule, nport, x, y;
 	int uart_type;
-#ifdef DEVFS
-	char	name[32];
-#endif
 
 	DPRINT((0, DBG_AUTOBOOT, "si%d: siattach\n", id->id_unit));
 
diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c
index c563298346ef..27adb432f0f1 100644
--- a/sys/fs/fdescfs/fdesc_vnops.c
+++ b/sys/fs/fdescfs/fdesc_vnops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)fdesc_vnops.c	8.9 (Berkeley) 1/21/94
  *
- * $Id: fdesc_vnops.c,v 1.15 1995/12/08 11:17:40 julian Exp $
+ * $Id: fdesc_vnops.c,v 1.16 1996/06/12 03:37:02 davidg Exp $
  */
 
 /*
@@ -98,7 +98,6 @@ static struct fdcache *
 static int	fdesc_inactive __P((struct vop_inactive_args *ap));
 static int	fdesc_ioctl __P((struct vop_ioctl_args *ap));
 static int	fdesc_lookup __P((struct vop_lookup_args *ap));
-static int	fdesc_nullop __P((void));
 static int	fdesc_open __P((struct vop_open_args *ap));
 static int	fdesc_pathconf __P((struct vop_pathconf_args *ap));
 static int	fdesc_print __P((struct vop_print_args *ap));
@@ -925,16 +924,6 @@ fdesc_badop()
 	/* NOTREACHED */
 }
 
-/*
- * /dev/fd vnode null operation
- */
-static int
-fdesc_nullop()
-{
-
-	return (0);
-}
-
 #define fdesc_create ((int (*) __P((struct  vop_create_args *)))fdesc_enotsupp)
 #define fdesc_mknod ((int (*) __P((struct  vop_mknod_args *)))fdesc_enotsupp)
 #define fdesc_close ((int (*) __P((struct  vop_close_args *)))nullop)
diff --git a/sys/fs/portalfs/portal_vnops.c b/sys/fs/portalfs/portal_vnops.c
index fcd595828733..e1ae90416231 100644
--- a/sys/fs/portalfs/portal_vnops.c
+++ b/sys/fs/portalfs/portal_vnops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)portal_vnops.c	8.8 (Berkeley) 1/21/94
  *
- * $Id: portal_vnops.c,v 1.11 1996/02/13 18:16:25 wollman Exp $
+ * $Id: portal_vnops.c,v 1.12 1996/06/12 03:37:29 davidg Exp $
  */
 
 /*
@@ -72,7 +72,6 @@ static int	portal_enotsupp __P((void));
 static int	portal_getattr __P((struct vop_getattr_args *ap));
 static int	portal_inactive __P((struct vop_inactive_args *ap));
 static int	portal_lookup __P((struct vop_lookup_args *ap));
-static int	portal_nullop __P((void));
 static int	portal_open __P((struct vop_open_args *ap));
 static int	portal_pathconf __P((struct vop_pathconf_args *ap));
 static int	portal_print __P((struct vop_print_args *ap));
@@ -630,16 +629,6 @@ portal_badop()
 	/* NOTREACHED */
 }
 
-/*
- * Portal vnode null operation
- */
-static int
-portal_nullop()
-{
-
-	return (0);
-}
-
 #define portal_create ((int (*) __P((struct vop_create_args *)))portal_enotsupp)
 #define portal_mknod ((int (*) __P((struct  vop_mknod_args *)))portal_enotsupp)
 #define portal_close ((int (*) __P((struct  vop_close_args *)))nullop)
diff --git a/sys/geom/geom_ccd.c b/sys/geom/geom_ccd.c
index f56b78bb431d..05451a987881 100644
--- a/sys/geom/geom_ccd.c
+++ b/sys/geom/geom_ccd.c
@@ -1,4 +1,4 @@
-/* $Id: ccd.c,v 1.11 1996/05/13 08:38:15 asami Exp $ */
+/* $Id: ccd.c,v 1.12 1996/05/13 09:17:42 asami Exp $ */
 
 /*	$NetBSD: ccd.c,v 1.22 1995/12/08 19:13:26 thorpej Exp $	*/
 
@@ -215,7 +215,9 @@ static	void ccdmakedisklabel __P((struct ccd_softc *));
 static	int ccdlock __P((struct ccd_softc *));
 static	void ccdunlock __P((struct ccd_softc *));
 
+#ifdef CCD_DEBUG
 static	void loopdelay __P((void));
+#endif
 
 #ifdef DEBUG
 static	void printiinfo __P((struct ccdiinfo *));
@@ -701,8 +703,7 @@ ccdstrategy(bp)
 {
 	register int unit = ccdunit(bp->b_dev);
 	register struct ccd_softc *cs = &ccd_softc[unit];
-	register daddr_t bn;
-	register int sz, s;
+	register int s;
 	int wlabel;
 	struct disklabel *lp;
 
@@ -1076,6 +1077,7 @@ ccdwrite(dev, uio, flags)
 	return (physio(ccdstrategy, NULL, dev, B_WRITE, minphys, uio));
 }
 
+#ifdef CCD_DEBUG
 static void
 loopdelay()
 {
@@ -1087,6 +1089,7 @@ loopdelay()
 			for (k = 0; k < 100; k++)
 				l = i * j * k;
 }
+#endif
 
 int
 ccdioctl(dev, cmd, data, flag, p)
@@ -1480,14 +1483,9 @@ ccdgetdisklabel(dev)
 	struct ccd_softc *cs = &ccd_softc[unit];
 	char *errstring;
 	struct disklabel *lp = &cs->sc_dkdev.dk_label;
-/*	struct cpu_disklabel *clp = &cs->sc_dkdev.dk_cpulabel; */
 	struct ccdgeom *ccg = &cs->sc_geom;
 
-	struct dos_partition dos_partdummy;
-	struct dkbad dkbaddummy;
-
 	bzero(lp, sizeof(*lp));
-/*	bzero(clp, sizeof(*clp)); */
 
 	lp->d_secperunit = cs->sc_size;
 	lp->d_secsize = ccg->ccg_secsize;
@@ -1519,8 +1517,7 @@ ccdgetdisklabel(dev)
 	 * Call the generic disklabel extraction routine.
 	 */
 	if (errstring = readdisklabel(CCDLABELDEV(dev), ccdstrategy,
-	    &cs->sc_dkdev.dk_label/*, &dos_partdummy, &dkbaddummy*/)) 
-		/*, &cs->sc_dkdev.dk_cpulabel)) */
+	    &cs->sc_dkdev.dk_label))
 		ccdmakedisklabel(cs);
 
 #ifdef DEBUG
diff --git a/sys/gnu/ext2fs/ext2_alloc.c b/sys/gnu/ext2fs/ext2_alloc.c
index eeff9f646118..8d4673338f40 100644
--- a/sys/gnu/ext2fs/ext2_alloc.c
+++ b/sys/gnu/ext2fs/ext2_alloc.c
@@ -211,11 +211,15 @@ nospace:
  * Note that the error return is not reflected back to the user. Rather
  * the previous block allocation will be used.
  */
+
+#ifdef FANCY_REALLOC
 #include <sys/sysctl.h>
 static int doasyncfree = 1;
 #ifdef	OPT_DEBUG
 SYSCTL_INT(_debug, 14, doasyncfree, CTLFLAG_RW, &doasyncfree, 0, "");
 #endif	/* OPT_DEBUG */
+#endif
+
 int
 ext2_reallocblks(ap)
 	struct vop_reallocblks_args /* {
diff --git a/sys/gnu/ext2fs/ext2_lookup.c b/sys/gnu/ext2fs/ext2_lookup.c
index 022f6d734003..caa16efcc8a2 100644
--- a/sys/gnu/ext2fs/ext2_lookup.c
+++ b/sys/gnu/ext2fs/ext2_lookup.c
@@ -974,7 +974,6 @@ ext2_dirempty(ip, parentino, cred)
 	struct dirtemplate dbuf;
 	register struct ext2_dir_entry *dp = (struct ext2_dir_entry *)&dbuf;
 	int error, count, namlen;
-	int     DIRBLKSIZ = ip->i_e2fs->s_blocksize;
 		 
 #define	MINDIRSIZ (sizeof (struct dirtemplate) / 2)
 
diff --git a/sys/gnu/ext2fs/ext2_vfsops.c b/sys/gnu/ext2fs/ext2_vfsops.c
index b2abbd53f686..d7c3e038885a 100644
--- a/sys/gnu/ext2fs/ext2_vfsops.c
+++ b/sys/gnu/ext2fs/ext2_vfsops.c
@@ -80,7 +80,6 @@ static int ext2_flushfiles __P((struct mount *mp, int flags, struct proc *p));
 static int ext2_mount __P((struct mount *,
 	    char *, caddr_t, struct nameidata *, struct proc *));
 static int ext2_mountfs __P((struct vnode *, struct mount *, struct proc *));
-static int ext2_mountroot __P((void));
 static int ext2_reload __P((struct mount *mountp, struct ucred *cred,
 			struct proc *p));
 static int ext2_sbupdate __P((struct ufsmount *, int));
@@ -115,17 +114,20 @@ extern u_long nextgennumber;
 static int ext2fs_inode_hash_lock;
 #endif
 
+static int	compute_sb_data __P((struct vnode * devvp,
+				     struct ext2_super_block * es,
+				     struct ext2_sb_info * fs));
+
+#ifdef notyet
+static int ext2_mountroot __P((void));
+
 /*
- * Called by main() when ufs is going to be mounted as root.
+ * Called by main() when ext2fs is going to be mounted as root.
  *
  * Name is updated by mount(8) after booting.
  */
 #define ROOTNAME	"root_device"
 
-static int	compute_sb_data __P((struct vnode * devvp,
-				     struct ext2_super_block * es,
-				     struct ext2_sb_info * fs));
-
 static int
 ext2_mountroot()
 {
@@ -183,6 +185,7 @@ ext2_mountroot()
 	inittodr(fs->s_es->s_wtime);		/* this helps to set the time */
 	return (0);
 }
+#endif
 
 /*
  * VFS Operations.
diff --git a/sys/gnu/fs/ext2fs/ext2_alloc.c b/sys/gnu/fs/ext2fs/ext2_alloc.c
index eeff9f646118..8d4673338f40 100644
--- a/sys/gnu/fs/ext2fs/ext2_alloc.c
+++ b/sys/gnu/fs/ext2fs/ext2_alloc.c
@@ -211,11 +211,15 @@ nospace:
  * Note that the error return is not reflected back to the user. Rather
  * the previous block allocation will be used.
  */
+
+#ifdef FANCY_REALLOC
 #include <sys/sysctl.h>
 static int doasyncfree = 1;
 #ifdef	OPT_DEBUG
 SYSCTL_INT(_debug, 14, doasyncfree, CTLFLAG_RW, &doasyncfree, 0, "");
 #endif	/* OPT_DEBUG */
+#endif
+
 int
 ext2_reallocblks(ap)
 	struct vop_reallocblks_args /* {
diff --git a/sys/gnu/fs/ext2fs/ext2_lookup.c b/sys/gnu/fs/ext2fs/ext2_lookup.c
index 022f6d734003..caa16efcc8a2 100644
--- a/sys/gnu/fs/ext2fs/ext2_lookup.c
+++ b/sys/gnu/fs/ext2fs/ext2_lookup.c
@@ -974,7 +974,6 @@ ext2_dirempty(ip, parentino, cred)
 	struct dirtemplate dbuf;
 	register struct ext2_dir_entry *dp = (struct ext2_dir_entry *)&dbuf;
 	int error, count, namlen;
-	int     DIRBLKSIZ = ip->i_e2fs->s_blocksize;
 		 
 #define	MINDIRSIZ (sizeof (struct dirtemplate) / 2)
 
diff --git a/sys/gnu/fs/ext2fs/ext2_vfsops.c b/sys/gnu/fs/ext2fs/ext2_vfsops.c
index b2abbd53f686..d7c3e038885a 100644
--- a/sys/gnu/fs/ext2fs/ext2_vfsops.c
+++ b/sys/gnu/fs/ext2fs/ext2_vfsops.c
@@ -80,7 +80,6 @@ static int ext2_flushfiles __P((struct mount *mp, int flags, struct proc *p));
 static int ext2_mount __P((struct mount *,
 	    char *, caddr_t, struct nameidata *, struct proc *));
 static int ext2_mountfs __P((struct vnode *, struct mount *, struct proc *));
-static int ext2_mountroot __P((void));
 static int ext2_reload __P((struct mount *mountp, struct ucred *cred,
 			struct proc *p));
 static int ext2_sbupdate __P((struct ufsmount *, int));
@@ -115,17 +114,20 @@ extern u_long nextgennumber;
 static int ext2fs_inode_hash_lock;
 #endif
 
+static int	compute_sb_data __P((struct vnode * devvp,
+				     struct ext2_super_block * es,
+				     struct ext2_sb_info * fs));
+
+#ifdef notyet
+static int ext2_mountroot __P((void));
+
 /*
- * Called by main() when ufs is going to be mounted as root.
+ * Called by main() when ext2fs is going to be mounted as root.
  *
  * Name is updated by mount(8) after booting.
  */
 #define ROOTNAME	"root_device"
 
-static int	compute_sb_data __P((struct vnode * devvp,
-				     struct ext2_super_block * es,
-				     struct ext2_sb_info * fs));
-
 static int
 ext2_mountroot()
 {
@@ -183,6 +185,7 @@ ext2_mountroot()
 	inittodr(fs->s_es->s_wtime);		/* this helps to set the time */
 	return (0);
 }
+#endif
 
 /*
  * VFS Operations.
diff --git a/sys/gnu/i386/isa/dgb.c b/sys/gnu/i386/isa/dgb.c
index a73fb5353cdf..243c42453832 100644
--- a/sys/gnu/i386/isa/dgb.c
+++ b/sys/gnu/i386/isa/dgb.c
@@ -1,5 +1,5 @@
 /*-
- *  dgb.c $Id: dgb.c,v 1.16 1996/03/28 14:27:26 scrappy Exp $
+ *  dgb.c $Id: dgb.c,v 1.17 1996/03/29 11:39:08 bde Exp $
  *
  *  Digiboard driver.
  *
@@ -168,7 +168,6 @@ static struct tty dgb_tty[NDGBPORTS];
  */
 
 /* Interrupt handling entry points. */
-static void	dgbintr		__P((int unit));
 static void	dgbpoll		__P((void *unit_c));
 
 /* Device switch entry points. */
@@ -211,8 +210,6 @@ static struct cdevsw dgb_cdevsw =
 	  ttselect,	nommap,		NULL,	"dgb",	NULL,	-1 };
 
 static	speed_t	dgbdefaultrate = TTYDEF_SPEED;
-static	u_int	dgb_events;	/* input chars + weighted output completions */
-static	int	dgbmajor;
 
 static	struct speedtab dgbspeedtab[] = {
 	0,	0, /* old (sysV-like) Bx codes */
@@ -240,9 +237,6 @@ static int dgbdebug=0;
 SYSCTL_INT(_debug, OID_AUTO, dgb_debug, CTLFLAG_RW,
 	&dgbdebug, 0, "");
 
-
-static int polltimeout=0;
-
 static int setwin __P((struct dgb_softc *sc, unsigned addr));
 static int setinitwin __P((struct dgb_softc *sc, unsigned addr));
 static void hidewin __P((struct dgb_softc *sc));
@@ -305,10 +299,8 @@ dgbprobe(dev)
 	struct isa_device	*dev;
 {
 	struct dgb_softc *sc= &dgb_softc[dev->id_unit];
-	int i, v, t;
+	int i, v;
 	u_long win_size;  /* size of vizible memory window */
-	u_char *mem;
-	int addr;
 	int unit=dev->id_unit;
 
 	sc->unit=dev->id_unit;
@@ -451,7 +443,6 @@ dgbattach(dev)
 	int addr;
 	struct dgb_p *port;
 	struct board_chan *bc;
-	struct global_data *gd;
 	int shrinkmem;
 	int nfails;
 	ushort *pstat;
@@ -1127,7 +1118,6 @@ dgbhardclose(port)
 {
 	struct dgb_softc *sc=&dgb_softc[port->unit];
 	struct board_chan *bc=port->brdchan;
-	int s;
 
 	setwin(sc,0);
 
@@ -1424,12 +1414,6 @@ dgbpoll(unit_c)
 	timeout(dgbpoll, unit_c, hz/25);
 }
 
-static void
-dgbintr(unit)
-	int	unit;
-{
-}
-
 static	int
 dgbioctl(dev, cmd, data, flag, p)
 	dev_t		dev;
@@ -1680,7 +1664,6 @@ static int
 dgbdrain(port)
 	struct dgb_p	*port;
 {
-	struct tty *tp=port->tty;
 	struct dgb_softc *sc=&dgb_softc[port->unit];
 	struct board_chan *bc=port->brdchan;
 	int error;
@@ -1787,7 +1770,6 @@ dgbparam(tp, t)
 	struct termios	*t;
 {
 	int dev=tp->t_dev;
-	int mynor=minor(dev);
 	int unit=MINOR_TO_UNIT(dev);
 	int pnum=MINOR_TO_PORT(dev);
 	struct dgb_softc *sc=&dgb_softc[unit];
diff --git a/sys/gnu/i386/isa/dgreg.h b/sys/gnu/i386/isa/dgreg.h
index 93f327dace1f..3864d070455f 100644
--- a/sys/gnu/i386/isa/dgreg.h
+++ b/sys/gnu/i386/isa/dgreg.h
@@ -1,5 +1,5 @@
 /*-
- *  dgreg.h $Id: dgreg.h,v 1.2 1995/10/04 21:51:26 jkh Exp $
+ *  dgreg.h $Id: dgreg.h,v 1.3 1995/12/22 16:08:15 bde Exp $
  *
  *  Digiboard driver.
  *
@@ -253,7 +253,7 @@ struct board_chan {
 #define PCXE    1
 #define	PCXEVE	2
 
-static char *board_desc[] = {
+static char * const board_desc[] = {
 	"PC/Xi (64K)",
 	"PC/Xe (64K)",
 	"PC/Xe (8K) ",
diff --git a/sys/gnu/i386/isa/nic3008.c b/sys/gnu/i386/isa/nic3008.c
index b3b890749531..3561e6f74a5e 100644
--- a/sys/gnu/i386/isa/nic3008.c
+++ b/sys/gnu/i386/isa/nic3008.c
@@ -1,6 +1,6 @@
-static char     nic38_id[] = "@(#)$Id: nic3008.c,v 1.14 1995/12/17 21:14:34 phk Exp $";
-/*******************************************************************************
- *  II - Version 0.1 $Revision: 1.14 $   $State: Exp $
+/* @(#)$Id: nic3008.c,v 1.15 1996/03/28 14:27:27 scrappy Exp $
+ *******************************************************************************
+ *  II - Version 0.1 $Revision: 1.15 $   $State: Exp $
  *
  * Copyright 1994 Dietmar Friede
  *******************************************************************************
@@ -10,6 +10,11 @@ static char     nic38_id[] = "@(#)$Id: nic3008.c,v 1.14 1995/12/17 21:14:34 phk
  *
  *******************************************************************************
  * $Log: nic3008.c,v $
+ * Revision 1.15  1996/03/28 14:27:27  scrappy
+ * Switched from using devfs_add_sw() to using devfs_add_swf()
+ *
+ * Reviewed by:	julian@freebsd.org
+ *
  * Revision 1.14  1995/12/17 21:14:34  phk
  * Staticize.
  *
@@ -521,7 +526,7 @@ nic_output(int cn)
 	int             mb = C_CHAN(cn) ? 7 : 5;
 	dpr_type       *dpr = sc->sc_dpr;
 	mbx_type       *mbx = &dpr->dpr_mbx[mb];
-	int             r, l;
+	int             l;
 	u_char         *b = (u_char *) dpr;
 	int		len= ctrl->o_len;
 	char	       *buf= ctrl->o_buf;
@@ -696,8 +701,7 @@ static	int
 nicioctl(dev_t dev, int cmd, caddr_t data, int flags, struct proc *p)
 {
 	int             error;
-	u_char          unit;
-	int             i, x;
+	int             x;
 	struct nic_softc *sc = &nic_sc[minor(dev)];
 	dpr_type       *dpr = sc->sc_dpr;
 	mbx_type       *mbx;
@@ -973,7 +977,6 @@ b_intr(int mb, int c, struct nic_softc * sc)
 		case 9:	/* DATA B3 IND */
 			{
 				u_char         *b = (u_char *) dpr;
-				u_char	mno;
 
 				b += dpr->buf_ptr[mb];
 				if (mbx->more_data)
diff --git a/sys/gnu/i386/isa/nic3008.h b/sys/gnu/i386/isa/nic3008.h
index da82696bde35..5a87409316c8 100644
--- a/sys/gnu/i386/isa/nic3008.h
+++ b/sys/gnu/i386/isa/nic3008.h
@@ -1,5 +1,5 @@
-static char     nic38hid[] = "@(#)$Id: nic3008.h,v 1.1 1995/01/25 14:06:18 jkr Exp jkr $";
-/*******************************************************************************
+/* @(#)$Id: nic3008.h,v 1.1 1995/02/14 15:00:12 jkh Exp $
+ *******************************************************************************
  *  II - Version 0.1 $Revision: 1.1 $   $State: Exp $
  *
  * Copyright 1994 Dietmar Friede
@@ -10,6 +10,15 @@ static char     nic38hid[] = "@(#)$Id: nic3008.h,v 1.1 1995/01/25 14:06:18 jkr E
  *
  *******************************************************************************
  * $Log: nic3008.h,v $
+ * Revision 1.1  1995/02/14 15:00:12  jkh
+ * An ISDN driver that supports the EDSS1 and the 1TR6 ISDN interfaces.
+ * EDSS1 is the "Euro-ISDN", 1TR6 is the soon obsolete german ISDN Interface.
+ * Obtained from: Dietmar Friede <dfriede@drnhh.neuhaus.de> and
+ * 	Juergen Krause <jkr@saarlink.de>
+ *
+ * This is only one part - the rest to follow in a couple of hours.
+ * This part is a benign import, since it doesn't affect anything else.
+ *
  *
  ******************************************************************************/
 
diff --git a/sys/gnu/i386/isa/nic3009.c b/sys/gnu/i386/isa/nic3009.c
index 314b645af53d..2e5a3225f3b8 100644
--- a/sys/gnu/i386/isa/nic3009.c
+++ b/sys/gnu/i386/isa/nic3009.c
@@ -1,6 +1,6 @@
-static char     nic39_id[] = "@(#)$Id: nic3009.c,v 1.14 1995/12/17 21:14:36 phk Exp $";
-/*******************************************************************************
- *  II - Version 0.1 $Revision: 1.14 $   $State: Exp $
+/* @(#)$Id: nic3009.c,v 1.15 1996/03/28 14:27:28 scrappy Exp $
+ *******************************************************************************
+ *  II - Version 0.1 $Revision: 1.15 $   $State: Exp $
  *
  * Copyright 1994 Dietmar Friede
  *******************************************************************************
@@ -10,6 +10,11 @@ static char     nic39_id[] = "@(#)$Id: nic3009.c,v 1.14 1995/12/17 21:14:36 phk
  *
  *******************************************************************************
  * $Log: nic3009.c,v $
+ * Revision 1.15  1996/03/28 14:27:28  scrappy
+ * Switched from using devfs_add_sw() to using devfs_add_swf()
+ *
+ * Reviewed by:	julian@freebsd.org
+ *
  * Revision 1.14  1995/12/17 21:14:36  phk
  * Staticize.
  *
@@ -603,8 +608,6 @@ nnicopen(dev_t dev, int flags, int fmt, struct proc *p)
 	struct nnic_softc *sc;
 	u_char          unit;
 	int             x;
-	unsigned	error;
-	u_char	b= 0xff;
 
 	unit = minor(dev);
 	/* minor number out of limits ? */
diff --git a/sys/gnu/i386/isa/nic3009.h b/sys/gnu/i386/isa/nic3009.h
index 223619f6a5ca..8e794cc250e9 100644
--- a/sys/gnu/i386/isa/nic3009.h
+++ b/sys/gnu/i386/isa/nic3009.h
@@ -1,5 +1,5 @@
-static char     nic39hid[] = "@(#)$Id: nic3009.h,v 1.1 1995/01/25 14:06:18 jkr Exp jkr $";
-/*******************************************************************************
+/* @(#)$Id: nic3009.h,v 1.1 1995/02/14 15:00:16 jkh Exp $
+ *******************************************************************************
  *  II - Version 0.1 $Revision: 1.1 $   $State: Exp $
  *
  * Copyright 1994 Dietmar Friede
@@ -10,6 +10,15 @@ static char     nic39hid[] = "@(#)$Id: nic3009.h,v 1.1 1995/01/25 14:06:18 jkr E
  *
  *******************************************************************************
  * $Log: nic3009.h,v $
+ * Revision 1.1  1995/02/14 15:00:16  jkh
+ * An ISDN driver that supports the EDSS1 and the 1TR6 ISDN interfaces.
+ * EDSS1 is the "Euro-ISDN", 1TR6 is the soon obsolete german ISDN Interface.
+ * Obtained from: Dietmar Friede <dfriede@drnhh.neuhaus.de> and
+ * 	Juergen Krause <jkr@saarlink.de>
+ *
+ * This is only one part - the rest to follow in a couple of hours.
+ * This part is a benign import, since it doesn't affect anything else.
+ *
  *
  ******************************************************************************/
 
diff --git a/sys/gnu/i386/isa/niccyreg.h b/sys/gnu/i386/isa/niccyreg.h
index a9d832849ea0..a696148485da 100644
--- a/sys/gnu/i386/isa/niccyreg.h
+++ b/sys/gnu/i386/isa/niccyreg.h
@@ -1,5 +1,5 @@
-static char     nicregh_id[] = "@(#)$Id: niccyreg.h,v 1.1 1995/01/25 14:06:18 jkr Exp jkr $";
-/*******************************************************************************
+/* @(#)$Id: niccyreg.h,v 1.1 1995/02/14 15:00:19 jkh Exp $
+ *******************************************************************************
  *  II - Version 0.1 $Revision: 1.1 $   $State: Exp $
  *
  * Copyright 1994 Dietmar Friede
@@ -10,6 +10,15 @@ static char     nicregh_id[] = "@(#)$Id: niccyreg.h,v 1.1 1995/01/25 14:06:18 jk
  *
  *******************************************************************************
  * $Log: niccyreg.h,v $
+ * Revision 1.1  1995/02/14 15:00:19  jkh
+ * An ISDN driver that supports the EDSS1 and the 1TR6 ISDN interfaces.
+ * EDSS1 is the "Euro-ISDN", 1TR6 is the soon obsolete german ISDN Interface.
+ * Obtained from: Dietmar Friede <dfriede@drnhh.neuhaus.de> and
+ * 	Juergen Krause <jkr@saarlink.de>
+ *
+ * This is only one part - the rest to follow in a couple of hours.
+ * This part is a benign import, since it doesn't affect anything else.
+ *
  *
  ******************************************************************************/
 
diff --git a/sys/gnu/isdn/if_ii.c b/sys/gnu/isdn/if_ii.c
index 2bc091ec1e57..cdfe768cf3f1 100644
--- a/sys/gnu/isdn/if_ii.c
+++ b/sys/gnu/isdn/if_ii.c
@@ -1,6 +1,6 @@
-static char     _if_iiid[] = "@(#)$Id: if_ii.c,v 1.4 1995/11/16 10:10:50 bde Exp $";
-/*******************************************************************************
- *  II - Version 0.1 $Revision: 1.4 $   $State: Exp $
+/* @(#)$Id: if_ii.c,v 1.5 1995/12/17 21:17:41 phk Exp $
+ *******************************************************************************
+ *  II - Version 0.1 $Revision: 1.5 $   $State: Exp $
  *
  * Copyright 1994 Dietmar Friede
  *******************************************************************************
@@ -82,8 +82,7 @@ static int
 iioutput(struct ifnet * ifp, struct mbuf * m, struct sockaddr * dst,
 	 struct rtentry * rtp)
 {
-	int             s, isr;
-	register struct ifqueue *ifq = 0;
+	int             s;
 
 	if (dst->sa_family != AF_INET)
 	{
@@ -113,7 +112,6 @@ iioutput(struct ifnet * ifp, struct mbuf * m, struct sockaddr * dst,
 int
 ii_input(int no, int len, char *buf, int dir)
 {
-	int             error = 0;
 	struct mbuf    *m;
 	struct ifnet   *ifp = &(ii_if[no]);
 	int             s;
diff --git a/sys/gnu/isdn/iispy.c b/sys/gnu/isdn/iispy.c
index 170281b836b1..4b6e83afde07 100644
--- a/sys/gnu/isdn/iispy.c
+++ b/sys/gnu/isdn/iispy.c
@@ -1,6 +1,6 @@
-static char     _ispyid[] = "@(#)$Id: iispy.c,v 1.10 1995/12/17 21:17:43 phk Exp $";
-/*******************************************************************************
- *  II - Version 0.1 $Revision: 1.10 $   $State: Exp $
+/* @(#)$Id: iispy.c,v 1.11 1996/03/28 14:27:51 scrappy Exp $
+ *******************************************************************************
+ *  II - Version 0.1 $Revision: 1.11 $   $State: Exp $
  *
  * Copyright 1994 Dietmar Friede
  *******************************************************************************
@@ -34,7 +34,7 @@ static char     _ispyid[] = "@(#)$Id: iispy.c,v 1.10 1995/12/17 21:17:43 phk Exp
 int	ispy_applnr;
 static int	next_if =0;
 static unsigned long ispy_cnt, ispy_out;
-static char	dir;
+static const char	dir = 0;
 #define ISPY_SIZE	260
 #define OPEN		1
 #define READ_WAIT	2
@@ -116,7 +116,6 @@ ispy_input(int no, int len, char *buf, int out)
 static	int
 ispyopen(dev_t dev, int flags, int fmt, struct proc *p)
 {
-	int             err;
 	struct ispy_data *ispy;
 
 	if (minor(dev)>NISPY)
@@ -144,8 +143,6 @@ ispyclose(dev_t dev, int flags, int fmt, struct proc *p)
 static	int
 ispyioctl (dev_t dev, int cmd, caddr_t data, int flags, struct proc *p)
 {
-        int     unit = minor(dev);
-
         switch (cmd) {
             default:
                 return (ENOTTY);
diff --git a/sys/gnu/isdn/iitel.c b/sys/gnu/isdn/iitel.c
index c01d832e5593..f28f29429a8e 100644
--- a/sys/gnu/isdn/iitel.c
+++ b/sys/gnu/isdn/iitel.c
@@ -1,6 +1,6 @@
-static char     _itelid[] = "@(#)$Id: iitel.c,v 1.12 1996/03/28 14:27:51 scrappy Exp $";
-/*******************************************************************************
- *  II - Version 0.1 $Revision: 1.12 $   $State: Exp $
+/* @(#)$Id: iitel.c,v 1.13 1996/04/07 13:20:40 bde Exp $
+ *******************************************************************************
+ *  II - Version 0.1 $Revision: 1.13 $   $State: Exp $
  *
  * Copyright 1994 Dietmar Friede
  *******************************************************************************
@@ -146,7 +146,6 @@ itel_disconnect(int no)
 int
 itelopen(dev_t dev, int flags, int fmt, struct proc *p)
 {
-	int             err;
 	struct itel_data *itel;
 
 	if (minor(dev)>NITEL)
@@ -179,8 +178,6 @@ itelclose(dev_t dev, int flags, int fmt, struct proc *p)
 int
 itelioctl (dev_t dev, int cmd, caddr_t data, int flags, struct proc *p)
 {
-        int     unit = minor(dev);
-
         switch (cmd) {
             default:
                 return (ENOTTY);
diff --git a/sys/gnu/isdn/iitty.c b/sys/gnu/isdn/iitty.c
index 2aa552d62b51..51df7a84e495 100644
--- a/sys/gnu/isdn/iitty.c
+++ b/sys/gnu/isdn/iitty.c
@@ -1,6 +1,6 @@
-static char     _ittyid[] = "@(#)$Id: iitty.c,v 1.20 1996/03/28 14:27:52 scrappy Exp $";
-/*******************************************************************************
- *  II - Version 0.1 $Revision: 1.20 $   $State: Exp $
+/* @(#)$Id: iitty.c,v 1.21 1996/04/02 22:06:23 gpalmer Exp $
+ *******************************************************************************
+ *  II - Version 0.1 $Revision: 1.21 $   $State: Exp $
  *
  * Copyright 1994 Dietmar Friede
  *******************************************************************************
@@ -295,8 +295,7 @@ ityparam(tp, t)
 	register struct tty *tp;
 	register struct termios *t;
 {
-	register        ity;
-	register int    cfcr, cflag = t->c_cflag;
+	register int    cflag = t->c_cflag;
 	int             unit = UNIT(tp->t_dev);
 	int             ospeed = t->c_ospeed;
 
diff --git a/sys/gnu/isdn/isdn.c b/sys/gnu/isdn/isdn.c
index 27580f32cc0f..838e70bdbf06 100644
--- a/sys/gnu/isdn/isdn.c
+++ b/sys/gnu/isdn/isdn.c
@@ -1,6 +1,6 @@
-static char     _isdnid[] = "@(#)$Id: isdn.c,v 1.11 1995/12/10 15:54:17 bde Exp $";
-/*******************************************************************************
- *  II - Version 0.1 $Revision: 1.11 $   $State: Exp $
+/* @(#)$Id: isdn.c,v 1.12 1995/12/17 21:17:48 phk Exp $
+ *******************************************************************************
+ *  II - Version 0.1 $Revision: 1.12 $   $State: Exp $
  *
  * Copyright 1994 Dietmar Friede
  *******************************************************************************
@@ -51,13 +51,11 @@ static timeout_t isdn_check;
 static char	*isdn_get_prot __P((int ap, int dir));
 static int	isdn_get_prot_size __P((int ap));
 static int	isdn_set_prot __P((int ap, int dir, char *p));
-static int	isdn_stat __P((int cn));
 static void	passout __P((int unit, int l, char *buf));
 
 static	d_open_t	isdnopen;
 static	d_close_t	isdnclose;
 static	d_read_t	isdnread;
-static	d_write_t	isdnwrite;
 static	d_ioctl_t	isdnioctl;
 
 #define CDEV_MAJOR 55
@@ -202,8 +200,6 @@ isdn_ctrl_attach(int n)
 static	int
 isdnopen(dev_t dev, int flags, int fmt, struct proc *p)
 {
-	int             err;
-
 	if (minor(dev)>Isdn_Typ)
 		return (ENXIO);
 
@@ -251,10 +247,9 @@ isdnread(dev_t dev, struct uio * uio, int ioflag)
 static	int
 isdnioctl(dev_t dev, int cmd, caddr_t data, int flags, struct proc *p)
 {
-	int             err, x, i;
+	int             err, x;
 	isdn_appl_t    *appl;
 	isdn_ctrl_t    *ctrl;
-	short          *val = (short *) data;
 	unsigned        ab, an, cn;
 
 	err = 0;
@@ -441,13 +436,6 @@ isdn_start_out(int cn)
 	splx(x);
 }
 
-static int
-isdn_stat(int cn)
-{
-	isdn_ctrl_t    *ctrl = &isdn_ctrl[cn];
-	return((*ctrl->state) (cn));
-}
-
 int
 isdn_output(int an)
 {
diff --git a/sys/gnu/isdn/isdn_ioctl.h b/sys/gnu/isdn/isdn_ioctl.h
index f83f3d26866e..64fe16398a58 100644
--- a/sys/gnu/isdn/isdn_ioctl.h
+++ b/sys/gnu/isdn/isdn_ioctl.h
@@ -1,6 +1,6 @@
-static char     _isdn_ioctl_id[] = "@(#)$Id: isdn_ioctl.h,v 1.2 1995/03/28 07:54:45 bde Exp $";
-/*******************************************************************************
- *  II - Version 0.1 $Revision: 1.2 $   $State: Exp $
+/* @(#)$Id: isdn_ioctl.h,v 1.3 1995/11/16 10:44:48 bde Exp $
+ *******************************************************************************
+ *  II - Version 0.1 $Revision: 1.3 $   $State: Exp $
  *
  * Copyright 1994 Dietmar Friede
  *******************************************************************************
@@ -10,6 +10,11 @@ static char     _isdn_ioctl_id[] = "@(#)$Id: isdn_ioctl.h,v 1.2 1995/03/28 07:54
  *
  *******************************************************************************
  * $Log: isdn_ioctl.h,v $
+ * Revision 1.3  1995/11/16 10:44:48  bde
+ * Completed function declarations.
+ *
+ * Added prototypes.
+ *
  * Revision 1.2  1995/03/28  07:54:45  bde
  * Add and move declarations to fix all of the warnings from `gcc -Wimplicit'
  * (except in netccitt, netiso and netns) that I didn't notice when I fixed
diff --git a/sys/i386/eisa/3c5x9.c b/sys/i386/eisa/3c5x9.c
index bd1955f75f01..43b317d7b88c 100644
--- a/sys/i386/eisa/3c5x9.c
+++ b/sys/i386/eisa/3c5x9.c
@@ -19,7 +19,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- *	$Id: 3c5x9.c,v 1.1 1996/02/26 01:01:37 gibbs Exp $
+ *	$Id: 3c5x9.c,v 1.2 1996/02/28 17:18:55 gibbs Exp $
  */
 
 #include "eisa.h"
@@ -127,7 +127,6 @@ ep_eisa_probe(void)
 {
 	u_long iobase;
 	struct eisa_device *e_dev = NULL;
-	int stat = 0;
 	int count;
 
 	count = 0;
@@ -204,7 +203,6 @@ ep_eisa_attach(e_dev)
 	resvaddr_t *ioport;
 	resvaddr_t *eisa_ioport;
 	u_char level_intr;
-	u_short conf;
 	int i;
 
 	/*
diff --git a/sys/i386/eisa/aha1742.c b/sys/i386/eisa/aha1742.c
index d439e1131fcb..d8fdf78fd966 100644
--- a/sys/i386/eisa/aha1742.c
+++ b/sys/i386/eisa/aha1742.c
@@ -14,7 +14,7 @@
  *
  * commenced: Sun Sep 27 18:14:01 PDT 1992
  *
- *      $Id: aha1742.c,v 1.52 1996/03/10 07:04:26 gibbs Exp $
+ *      $Id: aha1742.c,v 1.53 1996/05/22 00:03:50 dima Exp $
  */
 
 #include <sys/types.h>
@@ -709,7 +709,6 @@ ahbintr(arg)
 	int     target;
 	long int mboxval;
 	int	port;
-	int	unit;
 
 	ahb = (struct ahb_data *)arg;
 	port = ahb->baseport;
diff --git a/sys/i386/eisa/bt74x.c b/sys/i386/eisa/bt74x.c
index 462061c29c7b..28ab27546959 100644
--- a/sys/i386/eisa/bt74x.c
+++ b/sys/i386/eisa/bt74x.c
@@ -19,7 +19,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- *	$Id: bt74x.c,v 1.4 1996/01/31 18:02:18 gibbs Exp $
+ *	$Id: bt74x.c,v 1.5 1996/02/26 01:01:41 gibbs Exp $
  */
 
 #include "eisa.h"
@@ -140,8 +140,6 @@ static int
 bt_eisa_probe(void)
 {
 	u_long iobase;
-	char intdef;
-	u_long irq;
 	struct eisa_device *e_dev = NULL;
 	int count;
 
diff --git a/sys/i386/eisa/eisaconf.c b/sys/i386/eisa/eisaconf.c
index 37f1697e182d..7a719107e36f 100644
--- a/sys/i386/eisa/eisaconf.c
+++ b/sys/i386/eisa/eisaconf.c
@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: eisaconf.c,v 1.18 1996/04/07 17:03:12 bde Exp $
+ *	$Id: eisaconf.c,v 1.19 1996/04/20 21:21:49 gibbs Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -673,8 +673,6 @@ eisa_registerdev(e_dev, driver, kdc_template)
 	struct eisa_driver *driver;
 	struct kern_devconf *kdc_template;
 {
-	resvaddr_t *node;
-
 	e_dev->driver = driver;	/* Driver now owns this device */
 	e_dev->kdc = (struct kern_devconf *)malloc(sizeof(struct kern_devconf),
 						   M_DEVBUF, M_NOWAIT);
diff --git a/sys/i386/i386/perfmon.c b/sys/i386/i386/perfmon.c
index cde2455af42a..02c5cab49fd2 100644
--- a/sys/i386/i386/perfmon.c
+++ b/sys/i386/i386/perfmon.c
@@ -26,7 +26,7 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: perfmon.c,v 1.4 1996/03/28 21:00:29 wollman Exp $
+ *	$Id: perfmon.c,v 1.5 1996/03/29 17:48:21 wollman Exp $
  */
 
 #include <sys/param.h>
@@ -220,7 +220,6 @@ int
 writectl5(int pmc)
 {
 	quad_t newval = 0;
-	quad_t oldtsc;
 
 	if (ctl_shadow[1] & (PMCF_EN << 16)) {
 		if (ctl_shadow[1] & (PMCF_USR << 16))
diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c
index c96196da63bc..46cf1a8c2d4c 100644
--- a/sys/i386/i386/pmap.c
+++ b/sys/i386/i386/pmap.c
@@ -39,7 +39,7 @@
  * SUCH DAMAGE.
  *
  *	from:	@(#)pmap.c	7.7 (Berkeley)	5/12/91
- *	$Id: pmap.c,v 1.101 1996/06/07 02:36:08 dyson Exp $
+ *	$Id: pmap.c,v 1.102 1996/06/08 06:48:27 dyson Exp $
  */
 
 /*
@@ -725,7 +725,6 @@ pmap_release(pmap)
 {
 	vm_page_t p,n,ptdpg;
 	vm_object_t object = pmap->pm_pteobj;
-	int s;
 
 	if (object->ref_count != 1)
 		panic("pmap_release: pteobj reference count != 1");
@@ -1172,8 +1171,6 @@ pmap_remove_pte_mapping(pa)
 {
 	register pv_entry_t pv, *ppv, npv;
 	register unsigned *pte;
-	vm_offset_t va;
-	int anyvalid = 0;
 
 	ppv = pa_to_pvh(pa);
 
@@ -1289,8 +1286,6 @@ pmap_protect(pmap, sva, eva, prot)
 	vm_offset_t sva, eva;
 	vm_prot_t prot;
 {
-	register unsigned *pte;
-	register vm_offset_t va;
 	register unsigned *ptbase;
 	vm_offset_t pdnxt;
 	vm_offset_t ptpaddr;
diff --git a/sys/i386/i386/sys_machdep.c b/sys/i386/i386/sys_machdep.c
index 411cf675d280..f82b3f1ec542 100644
--- a/sys/i386/i386/sys_machdep.c
+++ b/sys/i386/i386/sys_machdep.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)sys_machdep.c	5.5 (Berkeley) 1/19/91
- *	$Id: sys_machdep.c,v 1.14 1996/01/03 21:41:32 wollman Exp $
+ *	$Id: sys_machdep.c,v 1.15 1996/03/03 01:57:44 jkh Exp $
  *
  */
 
@@ -185,8 +185,6 @@ i386_set_ldt(p, args, retval)
 	int error = 0, i, n;
  	int largest_ld;
 	struct pcb *pcb = &p->p_addr->u_pcb;
- 	union descriptor desc;
-	union descriptor *lp;
 	int s;
 	struct i386_set_ldt_args ua, *uap;
 
diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c
index b81cfc10601b..7cf89d17dce2 100644
--- a/sys/i386/i386/trap.c
+++ b/sys/i386/i386/trap.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)trap.c	7.4 (Berkeley) 5/13/91
- *	$Id: trap.c,v 1.75 1996/03/28 05:40:57 dyson Exp $
+ *	$Id: trap.c,v 1.76 1996/05/18 03:36:19 dyson Exp $
  */
 
 /*
@@ -606,9 +606,6 @@ trap_pfault(frame, usermode)
 		ftype = VM_PROT_READ;
 
 	if (map != kernel_map) {
-		vm_offset_t v;
-		vm_page_t mpte;
-
 		/*
 		 * Keep swapout from messing with us during this
 		 *	critical time.
diff --git a/sys/i386/ibcs2/ibcs2_ipc.c b/sys/i386/ibcs2/ibcs2_ipc.c
index e375ba06547d..778b8dc74651 100644
--- a/sys/i386/ibcs2/ibcs2_ipc.c
+++ b/sys/i386/ibcs2/ibcs2_ipc.c
@@ -70,8 +70,10 @@
 
 static void cvt_msqid2imsqid __P((struct msqid_ds *, struct ibcs2_msqid_ds *));
 static void cvt_imsqid2msqid __P((struct ibcs2_msqid_ds *, struct msqid_ds *));
+#ifdef unused
 static void cvt_sem2isem     __P((struct sem *, struct ibcs2_sem *));
 static void cvt_isem2sem     __P((struct ibcs2_sem *, struct sem *));
+#endif
 static void cvt_semid2isemid __P((struct semid_ds *, struct ibcs2_semid_ds *));
 static void cvt_isemid2semid __P((struct ibcs2_semid_ds *, struct semid_ds *));
 static void cvt_shmid2ishmid __P((struct shmid_ds *, struct ibcs2_shmid_ds *));
@@ -172,7 +174,7 @@ ibcs2_msgsys(p, uap, retval)
 /*
  * iBCS2 semsys call
  */
-
+#ifdef unused
 static void
 cvt_sem2isem(bp, ibp)
 struct sem *bp;
@@ -196,6 +198,7 @@ struct sem *bp;
 	bp->semzcnt = ibp->semzcnt;
 	return;
 }
+#endif
 
 static void
 cvt_semid2isemid(bp, ibp)
diff --git a/sys/i386/ibcs2/ibcs2_misc.c b/sys/i386/ibcs2/ibcs2_misc.c
index 44472d2bc1b2..1b32a532afd1 100644
--- a/sys/i386/ibcs2/ibcs2_misc.c
+++ b/sys/i386/ibcs2/ibcs2_misc.c
@@ -45,7 +45,7 @@
  *
  *	@(#)sun_misc.c	8.1 (Berkeley) 6/18/93
  *
- * $Id$
+ * $Id: ibcs2_misc.c,v 1.9 1995/10/23 19:46:51 swallace Exp $
  */
 
 /*
@@ -112,12 +112,14 @@ ibcs2_ulimit(p, uap, retval)
 	struct ibcs2_ulimit_args *uap;
 	int *retval;
 {
+#ifdef notyet
 	int error;
 	struct rlimit rl;
 	struct setrlimit_args {
 		int resource;
 		struct rlimit *rlp;
 	} sra;
+#endif
 #define IBCS2_GETFSIZE		1
 #define IBCS2_SETFSIZE		2
 #define IBCS2_GETPSIZE		3
@@ -567,7 +569,7 @@ ibcs2_getgroups(p, uap, retval)
 	int *retval;
 {
 	int error, i;
-	ibcs2_gid_t igid, *iset;
+	ibcs2_gid_t *iset;
 	struct getgroups_args sa;
 	gid_t *gp;
 	caddr_t sg = stackgap_init();
@@ -596,7 +598,7 @@ ibcs2_setgroups(p, uap, retval)
 	int *retval;
 {
 	int error, i;
-	ibcs2_gid_t igid, *iset;
+	ibcs2_gid_t *iset;
 	struct setgroups_args sa;
 	gid_t *gp;
 	caddr_t sg = stackgap_init();
@@ -887,7 +889,7 @@ ibcs2_nice(p, uap, retval)
 	struct ibcs2_nice_args *uap;
 	int *retval;
 {
-	int error, cur_nice = p->p_nice;
+	int error;
 	struct setpriority_args sa;
 
 	SCARG(&sa, which) = PRIO_PROCESS;
diff --git a/sys/i386/ibcs2/ibcs2_socksys.c b/sys/i386/ibcs2/ibcs2_socksys.c
index a5527c4bcfef..b35401421ed7 100644
--- a/sys/i386/ibcs2/ibcs2_socksys.c
+++ b/sys/i386/ibcs2/ibcs2_socksys.c
@@ -68,8 +68,6 @@ ibcs2_socksys(p, uap, retval)
 	register struct ibcs2_socksys_args *uap;
 	int *retval;
 {
-	register struct filedesc *fdp = p->p_fd;
-	register struct file *fp;
 	int error;
 	int realargs[7]; /* 1 for command, 6 for recvfrom */
 	void *passargs;
diff --git a/sys/i386/ibcs2/imgact_coff.c b/sys/i386/ibcs2/imgact_coff.c
index 3d0a0b5a24a8..4a8ef58b2573 100644
--- a/sys/i386/ibcs2/imgact_coff.c
+++ b/sys/i386/ibcs2/imgact_coff.c
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: imgact_coff.c,v 1.14 1996/03/12 06:20:19 peter Exp $
+ *	$Id: imgact_coff.c,v 1.15 1996/05/01 02:42:12 bde Exp $
  */
 
 #include <sys/param.h>
@@ -301,17 +301,11 @@ exec_coff_imgact(imgp)
 	struct scnhdr *scns;
 	int i;
 	struct vmspace *vmspace = imgp->proc->p_vmspace;
-	unsigned long vmaddr;
 	int nscns;
-	int error, len;
+	int error;
 	unsigned long text_offset = 0, text_address = 0, text_size = 0;
 	unsigned long data_offset = 0, data_address = 0, data_size = 0;
 	unsigned long bss_size = 0;
-	int need_hack_p;
-	unsigned long data_end;
-	unsigned long data_map_start, data_map_len, data_map_addr = 0;
-	unsigned long bss_address, bss_map_start, data_copy_len, bss_map_len;
-	unsigned char *data_buf = 0;
 	caddr_t hole;
 
 	if (fhdr->f_magic != I386_COFF ||
@@ -372,7 +366,7 @@ exec_coff_imgact(imgp)
 	    	/* .bss section */
 	    	bss_size = scns[i].s_size;
 	  } else if (scns[i].s_flags & STYP_LIB) {
-	    	char *buf = 0, *ptr;
+	    	char *buf = 0;
 	    	int foff = trunc_page(scns[i].s_scnptr);
 	    	int off = scns[i].s_scnptr - foff;
 	    	int len = round_page(scns[i].s_size + PAGE_SIZE);
diff --git a/sys/i386/isa/aha1542.c b/sys/i386/isa/aha1542.c
index 5447efc4960b..33a2378d6f79 100644
--- a/sys/i386/isa/aha1542.c
+++ b/sys/i386/isa/aha1542.c
@@ -12,7 +12,7 @@
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
  *
- *      $Id: aha1542.c,v 1.57 1996/03/31 18:19:38 gibbs Exp $
+ *      $Id: aha1542.c,v 1.58 1996/04/07 17:32:08 bde Exp $
  */
 
 /*
@@ -325,7 +325,10 @@ static struct aha_data {
 
 static u_int32_t	aha_adapter_info __P((int unit));
 static int	ahaattach __P((struct isa_device *dev));
+#ifdef	TUNE_1542
 static int	aha_bus_speed_check __P((struct aha_data *aha, int speed));
+static int	aha_set_bus_speed __P((struct aha_data *aha));
+#endif
 static int	aha_cmd __P((struct aha_data *aha, int icnt, int ocnt, int wait,
 			     u_char *retval, u_char opcode, ...));
 static void	aha_done __P((struct aha_data *aha, struct aha_ccb *ccb));
@@ -341,7 +344,6 @@ static int	aha_poll __P((struct aha_data *aha, struct scsi_xfer *xs,
 static int	ahaprobe __P((struct isa_device *dev));
 static void	aha_registerdev __P((struct isa_device *id));
 static int32_t	aha_scsi_cmd __P((struct scsi_xfer *xs));
-static int	aha_set_bus_speed __P((struct aha_data *aha));
 static timeout_t
 		aha_timeout;
 static char	*board_rev __P((struct aha_data *aha, int type));
diff --git a/sys/i386/isa/b004.c b/sys/i386/isa/b004.c
index 5b56a344167e..f0079a1dce62 100644
--- a/sys/i386/isa/b004.c
+++ b/sys/i386/isa/b004.c
@@ -66,9 +66,6 @@
 #include <i386/isa/isa_device.h>
 
 
-static u_char d_inb(u_int port);
-static void d_outb(u_int port, u_char data);
-
 static struct kern_devconf kdc_bqu[NBQU] = { {
 	0, 0, 0,		/* filled in by dev_attach */
 	"bqu", 0, { MDDT_ISA, 0 },
@@ -93,6 +90,9 @@ static struct kern_devconf kdc_bqu[NBQU] = { {
 #undef B004_DEBUG_2
 
 #ifdef B004_DEBUG
+static u_char d_inb(u_int port);
+static void d_outb(u_int port, u_char data);
+
 #define out(port,data)	d_outb(port, data)
 #define in(a)		d_inb(((u_int)a))
 #else
@@ -150,7 +150,7 @@ b004_base_addresses[B004_CHANCE] = {
     0x150, 0x190, 0, 0, 0, 0, 0, 0
 };
 
-
+#ifdef B004_DEBUG
 static void
 d_outb(u_int port, u_char data)
 {
@@ -159,13 +159,15 @@ d_outb(u_int port, u_char data)
 	outb(port,data);
 }
 
-static u_char d_inb(u_int port)
+static u_char
+d_inb(u_int port)
 {
 u_char ap;
 	ap=inb(port);
 	printf("INPUT 0x%x FROM 0x%x\n",ap,port);
 	return(ap);
 }
+#endif
 
 static int
 detected(int base)
diff --git a/sys/i386/isa/cy.c b/sys/i386/isa/cy.c
index 5ebc51a1d392..a4b80346b350 100644
--- a/sys/i386/isa/cy.c
+++ b/sys/i386/isa/cy.c
@@ -27,7 +27,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cy.c,v 1.31 1996/03/27 20:03:23 bde Exp $
+ *	$Id: cy.c,v 1.32 1996/05/02 09:34:34 phk Exp $
  */
 
 #include "cy.h"
@@ -343,7 +343,9 @@ static	int	sioattach	__P((struct isa_device *dev));
 static	void	cd1400_channel_cmd __P((cy_addr iobase, int cmd));
 static	timeout_t siodtrwakeup;
 static	void	comhardclose	__P((struct com_s *com));
+#if 0
 static	void	siointr1	__P((struct com_s *com));
+#endif
 static	int	commctl		__P((struct com_s *com, int bits, int how));
 static	int	comparam	__P((struct tty *tp, struct termios *t));
 static	int	sioprobe	__P((struct isa_device *dev));
@@ -1352,11 +1354,13 @@ cont:
 	schedsofttty();
 }
 
+#if 0
 static void
 siointr1(com)
 	struct com_s	*com;
 {
 }
+#endif
 
 static int
 sioioctl(dev, cmd, data, flag, p)
diff --git a/sys/i386/isa/gsc.c b/sys/i386/isa/gsc.c
index 430a44ba1fa2..8e98fc211d83 100644
--- a/sys/i386/isa/gsc.c
+++ b/sys/i386/isa/gsc.c
@@ -484,7 +484,6 @@ gscattach(struct isa_device *isdp)
 {
   int unit = isdp->id_unit;
   struct gsc_unit *scu = unittab + unit;
-  char	name[32];
 
   scu->flags |= FLAG_DEBUG;
 
diff --git a/sys/i386/isa/if_ep.c b/sys/i386/isa/if_ep.c
index aecba9b215ed..a6a24df2ca85 100644
--- a/sys/i386/isa/if_ep.c
+++ b/sys/i386/isa/if_ep.c
@@ -38,7 +38,7 @@
  */
 
 /*
- *  $Id: if_ep.c,v 1.43 1996/02/28 17:19:03 gibbs Exp $
+ *  $Id: if_ep.c,v 1.44 1996/05/24 15:22:36 gibbs Exp $
  *
  *  Promiscuous mode added and interrupt logic slightly changed
  *  to reduce the number of adapter failures. Transceiver select
@@ -196,7 +196,7 @@ static struct ep_board *
 ep_look_for_board_at(is)
     struct isa_device *is;
 {
-    int data, i, j, io_base, id_port = ELINK_ID_PORT;
+    int data, i, j, id_port = ELINK_ID_PORT;
     int count = 0;
 
     if (ep_current_tag == (EP_LAST_TAG + 1)) {
@@ -364,7 +364,6 @@ ep_isa_probe(is)
     struct ep_softc *sc;
     struct ep_board *epb;
     u_short k;
-    int i;
 
     if(( epb=ep_look_for_board_at(is) )==0)
 	return (0);
@@ -573,7 +572,7 @@ epinit(sc)
     struct ep_softc *sc;
 {
     register struct ifnet *ifp = &sc->arpcom.ac_if;
-    int s, i, j;
+    int s, i;
 
 	/*
     if (ifp->if_addrlist == (struct ifaddr *) 0)
diff --git a/sys/i386/isa/if_fe.c b/sys/i386/isa/if_fe.c
index 073379f60355..eb7ec898f770 100644
--- a/sys/i386/isa/if_fe.c
+++ b/sys/i386/isa/if_fe.c
@@ -21,7 +21,7 @@
  */
 
 /*
- * $Id: if_fe.c,v 1.13 1996/04/07 17:50:09 bde Exp $
+ * $Id: if_fe.c,v 1.14 1996/04/23 18:36:55 nate Exp $
  *
  * Device driver for Fujitsu MB86960A/MB86965A based Ethernet cards.
  * To be used with FreeBSD 2.x
@@ -2632,7 +2632,6 @@ fe_write_mbufs ( struct fe_softc *sc, struct mbuf *m )
 {
 	u_short addr_bmpr8 = sc->ioaddr[ FE_BMPR8 ];
 	u_short length, len;
-	short pad;
 	struct mbuf *mp;
 	u_char *data;
 	u_short savebyte;	/* WARNING: Architecture dependent!  */
diff --git a/sys/i386/isa/if_ix.c b/sys/i386/isa/if_ix.c
index 9f081cccc833..9a33ebd96db6 100644
--- a/sys/i386/isa/if_ix.c
+++ b/sys/i386/isa/if_ix.c
@@ -28,7 +28,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: if_ix.c,v 1.18 1996/01/26 09:27:27 phk Exp $
+ *	$Id: if_ix.c,v 1.19 1996/02/06 18:50:46 wollman Exp $
  */
 
 #include "ix.h"
@@ -567,8 +567,6 @@ ixattach(struct isa_device *dvp) {
 	int 			unit = dvp->id_unit;
 	ix_softc_t		*sc = &ix_softc[unit];
 	struct ifnet		*ifp = &sc->arpcom.ac_if;
-	struct ifaddr		*ifa;
-	struct sockaddr_dl	*sdl;
 
 	DEBUGBEGIN(DEBUGATTACH)
 	DEBUGDO(printf("ixattach:");)
diff --git a/sys/i386/isa/if_le.c b/sys/i386/isa/if_le.c
index 53710617e0d2..513ea29db25e 100644
--- a/sys/i386/isa/if_le.c
+++ b/sys/i386/isa/if_le.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: if_le.c,v 1.30 1996/02/06 18:50:47 wollman Exp $
+ * $Id: if_le.c,v 1.31 1996/03/23 19:34:12 fenner Exp $
  */
 
 /*
@@ -390,7 +390,6 @@ le_attach(
 {
     le_softc_t *sc = &le_softc[dvp->id_unit];
     struct ifnet *ifp = &sc->le_if;
-    struct ifaddr *ifa = ifp->if_addrlist;
 
     ifp->if_softc = sc;
     ifp->if_mtu = ETHERMTU;
diff --git a/sys/i386/isa/if_lnc.c b/sys/i386/isa/if_lnc.c
index 3e060a405617..46afc70409e8 100644
--- a/sys/i386/isa/if_lnc.c
+++ b/sys/i386/isa/if_lnc.c
@@ -126,7 +126,9 @@ static struct lnc_softc {
 	LNCSTATS_STRUCT
 } lnc_softc[NLNC];
 
+#ifdef LNC_MULTICAST
 static void lnc_setladrf __P((struct lnc_softc *sc));
+#endif
 static void lnc_stop __P((int unit));
 static void lnc_reset __P((int unit));
 static void lnc_free_mbufs __P((struct lnc_softc *sc));
diff --git a/sys/i386/isa/if_ze.c b/sys/i386/isa/if_ze.c
index 53330a0a588c..45d631521467 100644
--- a/sys/i386/isa/if_ze.c
+++ b/sys/i386/isa/if_ze.c
@@ -47,7 +47,7 @@
  */
 
 /*
- * $Id: if_ze.c,v 1.28 1996/01/26 09:27:33 phk Exp $
+ * $Id: if_ze.c,v 1.29 1996/02/06 18:50:50 wollman Exp $
  */
 
 #include "ze.h"
@@ -581,8 +581,6 @@ ze_attach(isa_dev)
 {
 	struct ze_softc *sc = &ze_softc[isa_dev->id_unit];
 	struct ifnet *ifp = &sc->arpcom.ac_if;
-	struct ifaddr *ifa;
-	struct sockaddr_dl *sdl;
 	int pl;
 
 	/* PCMCIA card can be offlined. Reconfiguration is required */
diff --git a/sys/i386/isa/if_zp.c b/sys/i386/isa/if_zp.c
index 242e27e4ad3c..f5d53fe5cf2a 100644
--- a/sys/i386/isa/if_zp.c
+++ b/sys/i386/isa/if_zp.c
@@ -34,7 +34,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *	From: if_ep.c,v 1.9 1994/01/25 10:46:29 deraadt Exp $
- *	$Id: if_zp.c,v 1.18 1996/03/23 21:32:39 nate Exp $
+ *	$Id: if_zp.c,v 1.19 1996/06/04 21:41:01 nate Exp $
  */
 /*-
  * TODO:
@@ -477,8 +477,6 @@ zpattach(isa_dev)
 	struct zp_softc *sc = &zp_softc[isa_dev->id_unit];
 	struct ifnet *ifp = &sc->arpcom.ac_if;
 	u_short i;
-	struct ifaddr *ifa;
-	struct sockaddr_dl *sdl;
 	int     pl;
 
 	/* PCMCIA card can be offlined. Reconfiguration is required */
diff --git a/sys/i386/isa/mcd.c b/sys/i386/isa/mcd.c
index 96eccecade64..f13b72a43539 100644
--- a/sys/i386/isa/mcd.c
+++ b/sys/i386/isa/mcd.c
@@ -40,9 +40,9 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: mcd.c,v 1.78 1996/05/03 16:49:02 phk Exp $
+ *	$Id: mcd.c,v 1.79 1996/06/08 09:18:21 bde Exp $
  */
-static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
+static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore";
 
 #include "mcd.h"
 #if NMCD > 0
diff --git a/sys/i386/isa/qcam.c b/sys/i386/isa/qcam.c
index 2ff00c607502..837b391d252b 100644
--- a/sys/i386/isa/qcam.c
+++ b/sys/i386/isa/qcam.c
@@ -154,9 +154,6 @@ qcam_registerdev (struct isa_device *id)
 static int
 qcam_probe (struct isa_device *devp)
 {
-	u_char reg, last;
-	int i, transitions = 0;
-
 	switch (devp->id_iobase) {	/* don't probe weird ports */
 	case IO_LPT1:
 	case IO_LPT2:
diff --git a/sys/i386/isa/random_machdep.c b/sys/i386/isa/random_machdep.c
index f2f51a9b2c49..8944a9dcc095 100644
--- a/sys/i386/isa/random_machdep.c
+++ b/sys/i386/isa/random_machdep.c
@@ -1,7 +1,7 @@
 /*
  * random_machdep.c -- A strong random number generator
  *
- * $Id: random_machdep.c,v 1.6 1996/04/07 18:16:26 bde Exp $
+ * $Id: random_machdep.c,v 1.7 1996/06/08 08:18:00 bde Exp $
  *
  * Version 0.95, last modified 18-Oct-95
  * 
@@ -98,7 +98,9 @@ static u_int32_t random_pool[POOLWORDS];
 static struct timer_rand_state keyboard_timer_state;
 static struct timer_rand_state extract_timer_state;
 static struct timer_rand_state irq_timer_state[ICU_LEN];
+#ifdef notyet
 static struct timer_rand_state blkdev_timer_state[MAX_BLKDEV];
+#endif
 static struct wait_queue *random_wait;
 
 inthand2_t *sec_intr_handler[ICU_LEN];
diff --git a/sys/i386/isa/rc.c b/sys/i386/isa/rc.c
index d05b42359729..b9bd2c410bfa 100644
--- a/sys/i386/isa/rc.c
+++ b/sys/i386/isa/rc.c
@@ -152,7 +152,7 @@ static int rc_scheduled_event = 0;
 
 /* for pstat -t */
 static struct tty rc_tty[NRC * CD180_NCHAN];
-static int        nrc_tty = NRC * CD180_NCHAN;
+static const int  nrc_tty = NRC * CD180_NCHAN;
 
 /* Flags */
 #define RC_DTR_OFF      0x0001          /* DTR wait, for close/open     */
@@ -258,7 +258,7 @@ static int
 rcattach(dvp)
 	struct  isa_device      *dvp;
 {
-	register int            i, chan, nec = dvp->id_iobase;
+	register int            chan, nec = dvp->id_iobase;
 	struct rc_softc         *rcb = &rc_softc[dvp->id_unit];
 	struct rc_chans         *rc  = &rc_chans[dvp->id_unit * CD180_NCHAN];
 	static int              rc_wakeup_started = 0;
@@ -595,9 +595,8 @@ void rcpoll()
 	register struct rc_chans *rc;
 	register struct rc_softc *rcb;
 	register u_char        *tptr, *eptr;
-	register int            s;
 	register struct tty    *tp;
-	register int            chan, icnt, c, nec, unit;
+	register int            chan, icnt, nec, unit;
 
 	if (rc_scheduled_event == 0)
 		return;
@@ -1110,7 +1109,7 @@ static void rc_reinit(rcb)
 struct rc_softc         *rcb;
 {
 	register struct rc_chans       *rc, *rce;
-	register int                    i, nec;
+	register int                    nec;
 
 	nec = rcb->rcb_addr;
 	rc_hwreset(rcb->rcb_unit, nec, RC_FAKEID);
@@ -1272,7 +1271,7 @@ int rc_test(nec, unit)
 	register int    nec;
 	int             unit;
 {
-	int     chan = 0, nopt = 0;
+	int     chan = 0;
 	int     i = 0, rcnt, old_level;
 	unsigned int    iack, chipid;
 	unsigned short  divs;
@@ -1482,8 +1481,6 @@ static void
 rc_wakeup(chan)
 	void	*chan;
 {
-	int		unit;
-
 	timeout(rc_wakeup, (caddr_t)NULL, 1);
 
 	if (rc_scheduled_event != 0) {
diff --git a/sys/i386/isa/si.c b/sys/i386/isa/si.c
index b9498c47b5fd..076f12eb7431 100644
--- a/sys/i386/isa/si.c
+++ b/sys/i386/isa/si.c
@@ -30,13 +30,13 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
  * NO EVENT SHALL THE AUTHORS BE LIABLE.
  *
- *	$Id: si.c,v 1.41 1996/05/30 23:41:35 peter Exp $
+ *	$Id: si.c,v 1.42 1996/06/08 10:18:12 peter Exp $
  */
 
 #ifndef lint
-static char si_copyright1[] =  "@(#) (C) Specialix International, 1990,1992",
-            si_copyright2[] =  "@(#) (C) Andy Rutter 1993",
-            si_copyright3[] =  "@(#) (C) Peter Wemm 1995";
+static const char si_copyright1[] =  "@(#) (C) Specialix International, 1990,1992",
+                  si_copyright2[] =  "@(#) (C) Andy Rutter 1993",
+                  si_copyright3[] =  "@(#) (C) Peter Wemm 1995";
 #endif	/* not lint */
 
 #include <sys/param.h>
@@ -234,7 +234,6 @@ static int si_pollrate;			/* in addition to irq */
 SYSCTL_INT(_machdep, OID_AUTO, si_pollrate, CTLFLAG_RD, &si_pollrate, 0, "");
 		 
 static int init_finished = 0;
-static int fastpoll = 0;
 static void si_poll __P((void *));
 #endif
 
@@ -494,9 +493,6 @@ siattach(id)
 	struct speedtab *spt;
 	int nmodule, nport, x, y;
 	int uart_type;
-#ifdef DEVFS
-	char	name[32];
-#endif
 
 	DPRINT((0, DBG_AUTOBOOT, "si%d: siattach\n", id->id_unit));
 
diff --git a/sys/i386/isa/sound/dmabuf.c b/sys/i386/isa/sound/dmabuf.c
index b0a6d1fc989f..bb64d7d8103e 100644
--- a/sys/i386/isa/sound/dmabuf.c
+++ b/sys/i386/isa/sound/dmabuf.c
@@ -678,8 +678,9 @@ DMAbuf_start_dma (int dev, unsigned long physaddr, int count, int dma_mode)
 {
   int             chan = audio_devs[dev]->dmachan;
   struct dma_buffparms *dmap = audio_devs[dev]->dmap;
+#ifdef linux
   unsigned long   flags;
-
+#endif
   /*
    * This function is not as portable as it should be.
    */
diff --git a/sys/i386/isa/wd.c b/sys/i386/isa/wd.c
index d50898244a7c..df8b99ba73f7 100644
--- a/sys/i386/isa/wd.c
+++ b/sys/i386/isa/wd.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)wd.c	7.2 (Berkeley) 5/9/91
- *	$Id: wd.c,v 1.108 1996/05/03 14:57:27 phk Exp $
+ *	$Id: wd.c,v 1.109 1996/06/08 10:03:35 bde Exp $
  */
 
 /* TODO:
@@ -282,7 +282,9 @@ static int wdcontrol(struct buf *bp);
 static int wdcommand(struct disk *du, u_int cylinder, u_int head,
 		     u_int sector, u_int count, u_int command);
 static int wdsetctlr(struct disk *du);
+#if 0
 static int wdwsetctlr(struct disk *du);
+#endif
 static int wdgetctlr(struct disk *du);
 static void wderror(struct buf *bp, struct disk *du, char *mesg);
 static void wdflushirq(struct disk *du, int old_ipl);
@@ -731,7 +733,6 @@ wdstart(int ctrlr)
 	if (wdtab[ctrlr].b_active)
 		return;
 #endif
-loop:
 	/* is there a drive for the controller to do a transfer with? */
 	bp = wdtab[ctrlr].controller_queue.tqh_first;
 	if (bp == NULL) {
@@ -1452,6 +1453,7 @@ wdsetctlr(struct disk *du)
 	return (0);
 }
 
+#if 0
 /*
  * Wait until driver is inactive, then set up controller.
  */
@@ -1468,6 +1470,7 @@ wdwsetctlr(struct disk *du)
 	splx(x);
 	return (stat);
 }
+#endif
 
 /*
  * issue READP to drive to ask it what it is.
diff --git a/sys/i386/linux/linux_ioctl.c b/sys/i386/linux/linux_ioctl.c
index 9c9c6688d5b8..821d84498bdc 100644
--- a/sys/i386/linux/linux_ioctl.c
+++ b/sys/i386/linux/linux_ioctl.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_ioctl.c,v 1.8 1996/03/04 11:15:19 peter Exp $
+ *  $Id: linux_ioctl.c,v 1.9 1996/03/10 22:30:53 peter Exp $
  */
 
 #include <sys/param.h>
@@ -122,7 +122,7 @@ static void
 bsd_to_linux_termios(struct termios *bsd_termios, 
 		struct linux_termios *linux_termios)
 {
-    int i, speed;
+    int i;
 
 #ifdef DEBUG
     printf("LINUX: BSD termios structure (input):\n");
@@ -263,7 +263,7 @@ static void
 linux_to_bsd_termios(struct linux_termios *linux_termios,
 		struct termios *bsd_termios)
 {
-    int i, speed;
+    int i;
 #ifdef DEBUG
     printf("LINUX: LINUX termios structure (input):\n");
     printf("i=%08x o=%08x c=%08x l=%08x line=%d\n",
@@ -451,10 +451,8 @@ int
 linux_ioctl(struct proc *p, struct linux_ioctl_args *args, int *retval)
 {
     struct termios bsd_termios;
-    struct winsize bsd_winsize;
     struct linux_termios linux_termios;
     struct linux_termio linux_termio;
-    struct linux_winsize linux_winsize;
     struct filedesc *fdp = p->p_fd;
     struct file *fp;
     int (*func)(struct file *fp, int com, caddr_t data, struct proc *p);
diff --git a/sys/i386/linux/linux_ipc.c b/sys/i386/linux/linux_ipc.c
index 854766b99cc8..72ebd20abd7c 100644
--- a/sys/i386/linux/linux_ipc.c
+++ b/sys/i386/linux/linux_ipc.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_ipc.c,v 1.6 1996/01/08 04:34:54 peter Exp $
+ *  $Id: linux_ipc.c,v 1.7 1996/03/02 19:37:56 peter Exp $
  */
 
 
@@ -44,7 +44,6 @@ static int linux_semget __P((struct proc *, struct linux_ipc_args *, int *));
 static int linux_semctl __P((struct proc *, struct linux_ipc_args *, int *));
 static int linux_msgsnd __P((struct proc *, struct linux_ipc_args *, int *));
 static int linux_msgrcv __P((struct proc *, struct linux_ipc_args *, int *));
-static int linux_msgop __P((struct proc *, struct linux_ipc_args *, int *));
 static int linux_msgctl __P((struct proc *, struct linux_ipc_args *, int *));
 static int linux_shmat __P((struct proc *, struct linux_ipc_args *, int *));
 static int linux_shmdt __P((struct proc *, struct linux_ipc_args *, int *));
diff --git a/sys/i386/linux/linux_misc.c b/sys/i386/linux/linux_misc.c
index 61127711d81f..f412cf0bcf02 100644
--- a/sys/i386/linux/linux_misc.c
+++ b/sys/i386/linux/linux_misc.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_misc.c,v 1.18 1996/04/07 17:38:49 bde Exp $
+ *  $Id: linux_misc.c,v 1.19 1996/05/02 10:43:13 phk Exp $
  */
 
 #include <sys/param.h>
@@ -166,7 +166,6 @@ linux_uselib(struct proc *p, struct linux_uselib_args *args, int *retval)
     unsigned long file_offset;
     vm_offset_t buffer;
     unsigned long bss_size;
-    char *ptr;
     int error;
     caddr_t sg;
     int locked;
@@ -683,7 +682,7 @@ linux_times(struct proc *p, struct linux_times_args *args, int *retval)
     struct timeval tv;
     struct linux_times_argv tms;
     struct rusage ru;
-    int error, s;
+    int error;
 
 #ifdef DEBUG
     printf("Linux-emul(%d): times(*)\n", p->p_pid);
diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c
index 0630156521d7..07abfbee29be 100644
--- a/sys/i386/linux/linux_sysvec.c
+++ b/sys/i386/linux/linux_sysvec.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_sysvec.c,v 1.4 1996/03/17 14:31:58 peter Exp $
+ *  $Id: linux_sysvec.c,v 1.5 1996/05/01 06:31:18 jkh Exp $
  */
 
 /* XXX we use functions that might not exist. */
@@ -361,7 +361,6 @@ linux_sigreturn(p, args, retval)
 void
 linux_prepsyscall(struct trapframe *tf, int *args, u_int *code, caddr_t *params)
 {
-	int i;
 	args[0] = tf->tf_ebx;
 	args[1] = tf->tf_ecx;
 	args[2] = tf->tf_edx;
diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c
index 7d4b5e66d2eb..607483f29026 100644
--- a/sys/kern/imgact_elf.c
+++ b/sys/kern/imgact_elf.c
@@ -26,7 +26,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: imgact_elf.c,v 1.4 1996/03/12 06:20:10 peter Exp $
+ *	$Id: imgact_elf.c,v 1.5 1996/05/01 02:42:43 bde Exp $
  */
 
 #include <sys/param.h>
@@ -139,7 +139,7 @@ static int
 map_pages(struct vnode *vp, vm_offset_t offset, 
 	     vm_offset_t *buf, vm_size_t size)
 {
-	int error, aresid;
+	int error;
 	vm_offset_t kern_buf;
 	vm_size_t pageoff;
 	
@@ -170,7 +170,6 @@ map_pages(struct vnode *vp, vm_offset_t offset,
 static void
 unmap_pages(struct vnode *vp, vm_offset_t buf, vm_size_t size)
 {
-	int error, aresid;
 	vm_size_t pageoff;
 	
 	pageoff = (buf & PAGE_MASK);
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index 96ea47403fea..a9b9b037256d 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_descrip.c	8.6 (Berkeley) 4/19/94
- * $Id: kern_descrip.c,v 1.27 1996/03/11 02:17:30 hsu Exp $
+ * $Id: kern_descrip.c,v 1.28 1996/03/27 19:19:58 bde Exp $
  */
 
 #include <sys/param.h>
@@ -682,8 +682,6 @@ void
 ffree(fp)
 	register struct file *fp;
 {
-	register struct file *fq;
-
 	LIST_REMOVE(fp, f_list);
 	crfree(fp->f_cred);
 #ifdef DIAGNOSTIC
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
index ad7b4db90e98..65ddfa5abfa0 100644
--- a/sys/kern/kern_exit.c
+++ b/sys/kern/kern_exit.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_exit.c	8.7 (Berkeley) 2/12/94
- * $Id: kern_exit.c,v 1.31 1996/04/07 17:38:56 bde Exp $
+ * $Id: kern_exit.c,v 1.32 1996/04/11 20:56:29 bde Exp $
  */
 
 #include "opt_ktrace.h"
@@ -108,7 +108,6 @@ exit1(p, rv)
 	int rv;
 {
 	register struct proc *q, *nq;
-	register struct proc **pp;
 	register struct vmspace *vm;
 
 	if (p->p_pid == 1) {
diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c
index 2ea502e13cc5..0e145a238dce 100644
--- a/sys/kern/kern_fork.c
+++ b/sys/kern/kern_fork.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_fork.c	8.6 (Berkeley) 4/8/94
- * $Id: kern_fork.c,v 1.20 1996/04/17 17:04:55 smpatel Exp $
+ * $Id: kern_fork.c,v 1.21 1996/05/02 11:38:05 peter Exp $
  */
 
 #include "opt_ktrace.h"
@@ -112,7 +112,6 @@ fork1(p1, flags, retval)
 	register struct proc *p2, *pptr;
 	register uid_t uid;
 	struct proc *newproc;
-	struct proc **hash;
 	int count;
 	static int nextpid, pidchecked = 0;
 
diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c
index bbcaa7b4d76e..cd02f3e80696 100644
--- a/sys/kern/kern_proc.c
+++ b/sys/kern/kern_proc.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_proc.c	8.7 (Berkeley) 2/14/95
- * $Id: kern_proc.c,v 1.18 1996/05/30 01:21:49 davidg Exp $
+ * $Id: kern_proc.c,v 1.19 1996/06/06 17:19:21 phk Exp $
  */
 
 #include <sys/param.h>
@@ -77,7 +77,7 @@ LIST_HEAD(uihashhead, uidinfo) *uihashtbl;
 static u_long uihash;		/* size of hash table - 1 */
 
 static void	orphanpg __P((struct pgrp *pg));
-static void	pgrpdump __P((void));
+static void	DDB_pgrpdump __P((void));
 
 /*
  * Other process lists
@@ -366,7 +366,7 @@ orphanpg(pg)
 
 #ifdef DEBUG
 static void
-pgrpdump()
+DDB_pgrpdump()
 {
 	register struct pgrp *pgrp;
 	register struct proc *p;
diff --git a/sys/kern/kern_random.c b/sys/kern/kern_random.c
index f2f51a9b2c49..8944a9dcc095 100644
--- a/sys/kern/kern_random.c
+++ b/sys/kern/kern_random.c
@@ -1,7 +1,7 @@
 /*
  * random_machdep.c -- A strong random number generator
  *
- * $Id: random_machdep.c,v 1.6 1996/04/07 18:16:26 bde Exp $
+ * $Id: random_machdep.c,v 1.7 1996/06/08 08:18:00 bde Exp $
  *
  * Version 0.95, last modified 18-Oct-95
  * 
@@ -98,7 +98,9 @@ static u_int32_t random_pool[POOLWORDS];
 static struct timer_rand_state keyboard_timer_state;
 static struct timer_rand_state extract_timer_state;
 static struct timer_rand_state irq_timer_state[ICU_LEN];
+#ifdef notyet
 static struct timer_rand_state blkdev_timer_state[MAX_BLKDEV];
+#endif
 static struct wait_queue *random_wait;
 
 inthand2_t *sec_intr_handler[ICU_LEN];
diff --git a/sys/kern/subr_diskslice.c b/sys/kern/subr_diskslice.c
index 16af2b6b8dc7..4b95b07fcd5a 100644
--- a/sys/kern/subr_diskslice.c
+++ b/sys/kern/subr_diskslice.c
@@ -43,7 +43,7 @@
  *	from: wd.c,v 1.55 1994/10/22 01:57:12 phk Exp $
  *	from: @(#)ufs_disksubr.c	7.16 (Berkeley) 5/4/91
  *	from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $
- *	$Id: subr_diskslice.c,v 1.24 1996/04/07 14:32:14 bde Exp $
+ *	$Id: subr_diskslice.c,v 1.25 1996/04/19 19:22:29 bde Exp $
  */
 
 #include <sys/param.h>
@@ -776,7 +776,6 @@ free_ds_label(ssp, slice)
 	int	slice;
 {
 	struct disklabel *lp;
-	int	part;
 	struct diskslice *sp;
 
 	sp = &ssp->dss_slices[slice];
diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c
index b81cfc10601b..7cf89d17dce2 100644
--- a/sys/kern/subr_trap.c
+++ b/sys/kern/subr_trap.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)trap.c	7.4 (Berkeley) 5/13/91
- *	$Id: trap.c,v 1.75 1996/03/28 05:40:57 dyson Exp $
+ *	$Id: trap.c,v 1.76 1996/05/18 03:36:19 dyson Exp $
  */
 
 /*
@@ -606,9 +606,6 @@ trap_pfault(frame, usermode)
 		ftype = VM_PROT_READ;
 
 	if (map != kernel_map) {
-		vm_offset_t v;
-		vm_page_t mpte;
-
 		/*
 		 * Keep swapout from messing with us during this
 		 *	critical time.
diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c
index d4b168dccec6..0df5269cdca8 100644
--- a/sys/kern/sys_pipe.c
+++ b/sys/kern/sys_pipe.c
@@ -16,7 +16,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- * $Id: sys_pipe.c,v 1.14 1996/03/17 04:52:10 dyson Exp $
+ * $Id: sys_pipe.c,v 1.15 1996/03/25 01:48:28 dyson Exp $
  */
 
 #ifndef OLD_PIPE
@@ -125,7 +125,6 @@ static struct fileops pipeops =
 int amountpipekva;
 
 static void pipeclose __P((struct pipe *cpipe));
-static void pipebufferinit __P((struct pipe *cpipe));
 static void pipeinit __P((struct pipe *cpipe));
 static __inline int pipelock __P((struct pipe *cpipe, int catch));
 static __inline void pipeunlock __P((struct pipe *cpipe));
@@ -135,7 +134,6 @@ static int pipe_build_write_buffer __P((struct pipe *wpipe, struct uio *uio));
 static void pipe_destroy_write_buffer __P((struct pipe *wpipe));
 static int pipe_direct_write __P((struct pipe *wpipe, struct uio *uio));
 static void pipe_clone_write_buffer __P((struct pipe *wpipe));
-static void pipe_mark_pages_clean __P((struct pipe *cpipe));
 #endif
 static int pipewrite __P((struct pipe *wpipe, struct uio *uio, int nbio));
 static void pipespace __P((struct pipe *cpipe));
@@ -1004,8 +1002,8 @@ pipe_close(fp, p)
 	struct file *fp;
 	struct proc *p;
 {
-	int error = 0;
 	struct pipe *cpipe = (struct pipe *)fp->f_data;
+
 	pipeclose(cpipe);
 	fp->f_data = NULL;
 	return 0;
diff --git a/sys/kern/sysv_sem.c b/sys/kern/sysv_sem.c
index 8c76e90f8d74..436ca840d515 100644
--- a/sys/kern/sysv_sem.c
+++ b/sys/kern/sysv_sem.c
@@ -1,4 +1,4 @@
-/*	$Id: sysv_sem.c,v 1.14 1995/12/28 01:31:38 jkh Exp $ */
+/*	$Id: sysv_sem.c,v 1.15 1996/01/05 16:38:01 wollman Exp $ */
 
 /*
  * Implementation of SVID semaphores
@@ -47,7 +47,6 @@ static sy_call_t *semcalls[] = {
 static int	semtot = 0;
 struct semid_ds *sema;		/* semaphore id pool */
 struct sem *sem;		/* semaphore pool */
-static struct map *semmap;		/* semaphore allocation map */
 static struct sem_undo *semu_list; 	/* list of active undo structures */
 int	*semu;			/* undo structure pool */
 
diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index 7815b6d05b47..3f5f8940ab79 100644
--- a/sys/kern/tty.c
+++ b/sys/kern/tty.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty.c	8.8 (Berkeley) 1/21/94
- * $Id: tty.c,v 1.80 1996/03/11 06:05:03 hsu Exp $
+ * $Id: tty.c,v 1.81 1996/05/02 14:20:27 phk Exp $
  */
 
 /*-
@@ -1151,7 +1151,9 @@ ttyflush(tp, rw)
 	register int s;
 
 	s = spltty();
+#if 0
 again:
+#endif
 	if (rw & FWRITE)
 		CLR(tp->t_state, TS_TTSTOP);
 #ifdef sun4c						/* XXX */
diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c
index 2918d3d7d0aa..36bcc5d08abd 100644
--- a/sys/kern/tty_pty.c
+++ b/sys/kern/tty_pty.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty_pty.c	8.4 (Berkeley) 2/20/95
- * $Id: tty_pty.c,v 1.37 1996/03/11 02:24:39 hsu Exp $
+ * $Id: tty_pty.c,v 1.38 1996/04/11 18:43:37 bde Exp $
  */
 
 /*
@@ -56,7 +56,9 @@
 #include <sys/devfsext.h>
 #endif /*DEVFS*/
 
+#ifdef notyet
 static void ptyattach __P((int n));
+#endif
 static void ptsstart __P((struct tty *tp));
 static void ptcwakeup __P((struct tty *tp, int flag));
 
@@ -71,7 +73,6 @@ static	d_open_t	ptcopen;
 static	d_close_t	ptcclose;
 static	d_read_t	ptcread;
 static	d_write_t	ptcwrite;
-static	d_ioctl_t	ptcioctl;
 static	d_select_t	ptcselect;
 
 #define CDEV_MAJOR_S 5
@@ -113,6 +114,7 @@ static int	npty = NPTY;		/* for pstat -t */
 #define	PF_NOSTOP	0x40
 #define PF_UCNTL	0x80		/* user control mode */
 
+#ifdef notyet
 /*
  * Establish n (or default if n is 1) ptys in the system.
  *
@@ -122,7 +124,6 @@ static void
 ptyattach(n)
 	int n;
 {
-#ifdef notyet
 	char *mem;
 	register u_long ntb;
 #define	DEFAULT_NPTY	32
@@ -137,8 +138,8 @@ ptyattach(n)
 	mem = (char *)ALIGN(mem + ntb);
 	pt_ioctl = (struct pt_ioctl *)mem;
 	npty = n;
-#endif
 }
+#endif
 
 /*ARGSUSED*/
 static	int
@@ -789,7 +790,6 @@ ptc_drvinit(void *unused)
 {
 #ifdef DEVFS
 	int i,j,k;
-	char name[16];
 #endif
 	dev_t dev;
 
@@ -806,8 +806,6 @@ ptc_drvinit(void *unused)
 #define NPTY MAXUNITS
 #endif
 		for ( i = 0 ; i<NPTY ; i++ ) {
-			void *x;
-
 			j = i / 32;
 			k = i % 32;
 			devfs_token_pts[i] = 
@@ -824,5 +822,3 @@ ptc_drvinit(void *unused)
 }
 
 SYSINIT(ptcdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR_C,ptc_drvinit,NULL)
-
-
diff --git a/sys/kern/uipc_sockbuf.c b/sys/kern/uipc_sockbuf.c
index a09ed21a58d7..b3bdc44861f1 100644
--- a/sys/kern/uipc_sockbuf.c
+++ b/sys/kern/uipc_sockbuf.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uipc_socket2.c	8.1 (Berkeley) 6/10/93
- * $Id: uipc_socket2.c,v 1.8 1996/01/05 21:41:54 wollman Exp $
+ * $Id: uipc_socket2.c,v 1.9 1996/03/11 15:37:32 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -162,7 +162,6 @@ sonewconn1(head, connstatus)
 	int connstatus;
 {
 	register struct socket *so;
-	int soqueue = connstatus ? 1 : 0;
 
 	if (head->so_qlen > 3 * head->so_qlimit / 2)
 		return ((struct socket *)0);
diff --git a/sys/kern/uipc_socket2.c b/sys/kern/uipc_socket2.c
index a09ed21a58d7..b3bdc44861f1 100644
--- a/sys/kern/uipc_socket2.c
+++ b/sys/kern/uipc_socket2.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)uipc_socket2.c	8.1 (Berkeley) 6/10/93
- * $Id: uipc_socket2.c,v 1.8 1996/01/05 21:41:54 wollman Exp $
+ * $Id: uipc_socket2.c,v 1.9 1996/03/11 15:37:32 davidg Exp $
  */
 
 #include <sys/param.h>
@@ -162,7 +162,6 @@ sonewconn1(head, connstatus)
 	int connstatus;
 {
 	register struct socket *so;
-	int soqueue = connstatus ? 1 : 0;
 
 	if (head->so_qlen > 3 * head->so_qlimit / 2)
 		return ((struct socket *)0);
diff --git a/sys/miscfs/fdesc/fdesc_vnops.c b/sys/miscfs/fdesc/fdesc_vnops.c
index c563298346ef..27adb432f0f1 100644
--- a/sys/miscfs/fdesc/fdesc_vnops.c
+++ b/sys/miscfs/fdesc/fdesc_vnops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)fdesc_vnops.c	8.9 (Berkeley) 1/21/94
  *
- * $Id: fdesc_vnops.c,v 1.15 1995/12/08 11:17:40 julian Exp $
+ * $Id: fdesc_vnops.c,v 1.16 1996/06/12 03:37:02 davidg Exp $
  */
 
 /*
@@ -98,7 +98,6 @@ static struct fdcache *
 static int	fdesc_inactive __P((struct vop_inactive_args *ap));
 static int	fdesc_ioctl __P((struct vop_ioctl_args *ap));
 static int	fdesc_lookup __P((struct vop_lookup_args *ap));
-static int	fdesc_nullop __P((void));
 static int	fdesc_open __P((struct vop_open_args *ap));
 static int	fdesc_pathconf __P((struct vop_pathconf_args *ap));
 static int	fdesc_print __P((struct vop_print_args *ap));
@@ -925,16 +924,6 @@ fdesc_badop()
 	/* NOTREACHED */
 }
 
-/*
- * /dev/fd vnode null operation
- */
-static int
-fdesc_nullop()
-{
-
-	return (0);
-}
-
 #define fdesc_create ((int (*) __P((struct  vop_create_args *)))fdesc_enotsupp)
 #define fdesc_mknod ((int (*) __P((struct  vop_mknod_args *)))fdesc_enotsupp)
 #define fdesc_close ((int (*) __P((struct  vop_close_args *)))nullop)
diff --git a/sys/miscfs/portal/portal_vnops.c b/sys/miscfs/portal/portal_vnops.c
index fcd595828733..e1ae90416231 100644
--- a/sys/miscfs/portal/portal_vnops.c
+++ b/sys/miscfs/portal/portal_vnops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)portal_vnops.c	8.8 (Berkeley) 1/21/94
  *
- * $Id: portal_vnops.c,v 1.11 1996/02/13 18:16:25 wollman Exp $
+ * $Id: portal_vnops.c,v 1.12 1996/06/12 03:37:29 davidg Exp $
  */
 
 /*
@@ -72,7 +72,6 @@ static int	portal_enotsupp __P((void));
 static int	portal_getattr __P((struct vop_getattr_args *ap));
 static int	portal_inactive __P((struct vop_inactive_args *ap));
 static int	portal_lookup __P((struct vop_lookup_args *ap));
-static int	portal_nullop __P((void));
 static int	portal_open __P((struct vop_open_args *ap));
 static int	portal_pathconf __P((struct vop_pathconf_args *ap));
 static int	portal_print __P((struct vop_print_args *ap));
@@ -630,16 +629,6 @@ portal_badop()
 	/* NOTREACHED */
 }
 
-/*
- * Portal vnode null operation
- */
-static int
-portal_nullop()
-{
-
-	return (0);
-}
-
 #define portal_create ((int (*) __P((struct vop_create_args *)))portal_enotsupp)
 #define portal_mknod ((int (*) __P((struct  vop_mknod_args *)))portal_enotsupp)
 #define portal_close ((int (*) __P((struct  vop_close_args *)))nullop)
diff --git a/sys/net/bsd_comp.c b/sys/net/bsd_comp.c
index 4e438b533149..1da1f4da2fdb 100644
--- a/sys/net/bsd_comp.c
+++ b/sys/net/bsd_comp.c
@@ -41,7 +41,7 @@
  * This version is for use with mbufs on BSD-derived systems.
  *
  * from: Id: bsd-comp.c,v 1.11 1995/07/04 03:35:11 paulus Exp
- * $Id$
+ * $Id: bsd_comp.c,v 1.3 1995/10/31 20:51:22 peter Exp $
  */
 
 #include <sys/param.h>
@@ -487,11 +487,10 @@ bsd_compress(state, mret, mp, slen, maxolen)
     struct bsd_dict *dictp;
     u_char c;
     int hval, disp, ent, ilen;
-    struct mbuf *np;
     u_char *rptr, *wptr;
     u_char *cp_end;
     int olen;
-    struct mbuf *m, **mnp;
+    struct mbuf *m;
 
 #define PUTBYTE(v) {					\
     ++olen;						\
@@ -837,7 +836,6 @@ bsd_decompress(state, cmp, dmpp)
     struct mbuf *m, *dmp, *mret;
     int adrs, ctrl, ilen;
     int space, codelen, extra;
-    struct mbuf *last;
 
     /*
      * Save the address/control from the PPP header
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index 7421541713ef..c4b00a7ee687 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)if_ethersubr.c	8.1 (Berkeley) 6/10/93
- * $Id: if_ethersubr.c,v 1.17 1996/06/01 23:23:54 gpalmer Exp $
+ * $Id: if_ethersubr.c,v 1.18 1996/06/10 23:07:30 gpalmer Exp $
  */
 
 #include <sys/param.h>
@@ -379,9 +379,11 @@ ether_input(ifp, eh, m)
 	struct mbuf *m;
 {
 	register struct ifqueue *inq;
-	register struct llc *l;
 	u_short ether_type;
 	int s;
+#if defined (ISO) || defined (LLC)
+	register struct llc *l;
+#endif
 
 	if ((ifp->if_flags & IFF_UP) == 0) {
 		m_freem(m);
diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c
index 68bd83962fdb..948282658af7 100644
--- a/sys/netinet/igmp.c
+++ b/sys/netinet/igmp.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)igmp.c	8.1 (Berkeley) 7/19/93
- * $Id: igmp.c,v 1.17 1996/03/26 19:16:42 fenner Exp $
+ * $Id: igmp.c,v 1.18 1996/04/18 15:41:10 wollman Exp $
  */
 
 /*
@@ -68,7 +68,6 @@
 #include <netinet/igmp.h>
 #include <netinet/igmp_var.h>
 
-static int	fill_rti __P((struct in_multi *inm));
 static struct router_info *
 		find_rti __P((struct ifnet *ifp));
 
@@ -434,7 +433,6 @@ igmp_sendpkt(inm, type, addr)
         struct igmp *igmp;
         struct ip *ip;
         struct ip_moptions imo;
-	struct sockaddr_in *sin;
 
         MGETHDR(m, M_DONTWAIT, MT_HEADER);
         if (m == NULL)
diff --git a/sys/netipx/ipx_ip.c b/sys/netipx/ipx_ip.c
index 1b7624f5e519..e3362056b669 100644
--- a/sys/netipx/ipx_ip.c
+++ b/sys/netipx/ipx_ip.c
@@ -33,7 +33,7 @@
  * 
  *	@(#)ipx_ip.c
  *
- * $Id: ipx_ip.c,v 1.7 1996/03/11 15:13:50 davidg Exp $
+ * $Id: ipx_ip.c,v 1.8 1996/05/08 19:31:45 jhay Exp $
  */
 
 /*
@@ -212,7 +212,6 @@ ipxip_input(m, hlen)
 	s = splimp();
 	if (IF_QFULL(ifq)) {
 		IF_DROP(ifq);
-bad:
 		m_freem(m);
 		splx(s);
 		return;
@@ -287,7 +286,6 @@ ipxipoutput(ifp, m, dst, rt)
 		ifn->ifen_ifnet.if_ierrors = error;
 	}
 	return (error);
-bad:
 	m_freem(m);
 	return (ENETUNREACH);
 }
diff --git a/sys/pci/if_vx.c b/sys/pci/if_vx.c
index 15757993da48..f0e86e128d01 100644
--- a/sys/pci/if_vx.c
+++ b/sys/pci/if_vx.c
@@ -189,8 +189,6 @@ vx_pci_attach(
     struct ifnet *ifp;
     u_short i, *p;
     u_long j;
-    struct ifaddr *ifa;
-    struct sockaddr_dl *sdl;
 
     if (unit >= NVX) {
        printf("vx%d: not configured; kernel is built for only %d device%s.\n",
diff --git a/sys/pci/meteor.c b/sys/pci/meteor.c
index b26154f7c21a..2f2917f0d7b8 100644
--- a/sys/pci/meteor.c
+++ b/sys/pci/meteor.c
@@ -1089,6 +1089,7 @@ met_attach(pcici_t tag, int unit)
 
 #define UNIT(x)	((x) & 0x07)
 
+#ifdef unused
 static int
 meteor_reset(dev_t dev)
 {
@@ -1112,7 +1113,7 @@ struct	saa7116_regs	*m;
 	return 0;
 
 }
-
+#endif
 
 /*---------------------------------------------------------
 **
@@ -1171,7 +1172,9 @@ meteor_close(dev_t dev, int flags, int fmt, struct proc *p)
 {
 	meteor_reg_t *mtr;
 	int	unit; 
+#ifdef METEOR_DEALLOC_ABOVE
 	int	temp;
+#endif
 
 	unit = UNIT(minor(dev));
 	if (unit >= NMETEOR)	/* unit out of range */
diff --git a/sys/pci/ncr.c b/sys/pci/ncr.c
index 489ed3d04c36..528584ba6f34 100644
--- a/sys/pci/ncr.c
+++ b/sys/pci/ncr.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: ncr.c,v 1.71 1996/05/02 14:20:47 phk Exp $
+**  $Id: ncr.c,v 1.72 1996/05/03 21:01:38 phk Exp $
 **
 **  Device driver for the   NCR 53C810   PCI-SCSI-Controller.
 **
@@ -1254,9 +1254,9 @@ static	void	ncr_attach	(pcici_t tag, int unit);
 
 
 static char ident[] =
-	"\n$Id: ncr.c,v 1.71 1996/05/02 14:20:47 phk Exp $\n";
+	"\n$Id: ncr.c,v 1.72 1996/05/03 21:01:38 phk Exp $\n";
 
-static u_long	ncr_version = NCR_VERSION	* 11
+static const u_long	ncr_version = NCR_VERSION	* 11
 	+ (u_long) sizeof (struct ncb)	*  7
 	+ (u_long) sizeof (struct ccb)	*  5
 	+ (u_long) sizeof (struct lcb)	*  3
diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c
index 6f3f2014d8b5..e16b2572d9fd 100644
--- a/sys/scsi/cd.c
+++ b/sys/scsi/cd.c
@@ -14,7 +14,7 @@
  *
  * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
  *
- *      $Id: cd.c,v 1.68 1996/03/28 14:33:54 scrappy Exp $
+ *      $Id: cd.c,v 1.69 1996/03/29 11:57:52 bde Exp $
  */
 
 #include "opt_bounce.h"
@@ -58,7 +58,9 @@ static errval cd_pause __P((u_int32_t, u_int32_t));
 static errval cd_reset __P((u_int32_t));
 static errval cd_play_msf __P((u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t));
 static errval cd_play __P((u_int32_t, u_int32_t, u_int32_t));
+#ifdef notyet
 static errval cd_play_big __P((u_int32_t unit, u_int32_t blk, u_int32_t len));
+#endif
 static errval cd_play_tracks __P((u_int32_t, u_int32_t, u_int32_t, u_int32_t, u_int32_t));
 static errval cd_read_subchannel __P((u_int32_t, u_int32_t, u_int32_t, int, struct cd_sub_channel_info *, u_int32_t));
 static errval cd_getdisklabel __P((u_int8_t));
@@ -1191,6 +1193,7 @@ cd_play(unit, blk, len)
 		0));
 }
 
+#ifdef notyet
 /*
  * Get scsi driver to send a "start playing" command
  */
@@ -1220,6 +1223,7 @@ cd_play_big(unit, blk, len)
 		NULL,
 		0));
 }
+#endif
 
 /*
  * Get scsi driver to send a "start playing" command
diff --git a/sys/scsi/od.c b/sys/scsi/od.c
index 4086af019068..ec394299c304 100644
--- a/sys/scsi/od.c
+++ b/sys/scsi/od.c
@@ -28,7 +28,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: od.c,v 1.15.1.3 1996/05/06 15:14:57 shun Exp $
+ *	$Id: od.c,v 1.16 1996/05/19 19:26:21 joerg Exp $
  */
 
 /*
@@ -113,7 +113,9 @@ struct scsi_data {
 static void	od_get_geometry __P((u_int32_t, u_int16_t *,
 				     u_char *, u_char *));
 static errval	od_get_parms __P((int unit, int flags));
+#ifdef notyet
 static errval	od_reassign_blocks __P((int unit, int block));
+#endif
 static u_int32_t	od_size __P((int unit, int flags));
 static int	od_sense_handler __P((struct scsi_xfer *));
 static void	odstart __P((u_int32_t, u_int32_t));
diff --git a/sys/sys/sem.h b/sys/sys/sem.h
index 3526a16d337f..c6ab60cdf228 100644
--- a/sys/sys/sem.h
+++ b/sys/sys/sem.h
@@ -1,4 +1,4 @@
-/* $Id: sem.h,v 1.6 1995/08/30 00:33:34 bde Exp $ */
+/* $Id: sem.h,v 1.7 1995/12/27 15:25:30 joerg Exp $ */
 /*	$NetBSD: sem.h,v 1.5 1994/06/29 06:45:15 cgd Exp $	*/
 
 /*
@@ -145,7 +145,6 @@ extern struct seminfo	seminfo;
 
 extern struct semid_ds *sema;	/* semaphore id pool */
 extern struct sem *sem;		/* semaphore pool */
-extern struct map *semmap;	/* semaphore allocation map */
 extern struct sem_undo *semu_list; /* list of active undo structures */
 extern int	*semu;		/* undo structure pool */
 
diff --git a/sys/ufs/lfs/lfs_segment.c b/sys/ufs/lfs/lfs_segment.c
index e08e07d91aa3..093a19cab0b8 100644
--- a/sys/ufs/lfs/lfs_segment.c
+++ b/sys/ufs/lfs/lfs_segment.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs_segment.c	8.5 (Berkeley) 1/4/94
- * $Id: lfs_segment.c,v 1.15 1995/12/03 11:16:46 bde Exp $
+ * $Id: lfs_segment.c,v 1.16 1995/12/17 21:09:49 phk Exp $
  */
 
 #include <sys/param.h>
@@ -152,7 +152,9 @@ void	 lfs_iset __P((struct inode *, daddr_t, time_t));
 static int lfs_match_data __P((struct lfs *, struct buf *));
 static int lfs_match_dindir __P((struct lfs *, struct buf *));
 static int lfs_match_indir __P((struct lfs *, struct buf *));
+#ifdef TRIPLE
 static int lfs_match_tindir __P((struct lfs *, struct buf *));
+#endif
 static void lfs_newseg __P((struct lfs *));
 static void lfs_shellsort __P((struct buf **, daddr_t *, register int));
 static void lfs_supercallback __P((struct buf *));
@@ -1058,6 +1060,7 @@ lfs_match_dindir(fs, bp)
 	return (lbn < 0 && (-lbn - NDADDR) % NINDIR(fs) == 1);
 }
 
+#ifdef TRIPLE
 static int
 lfs_match_tindir(fs, bp)
 	struct lfs *fs;
@@ -1068,6 +1071,7 @@ lfs_match_tindir(fs, bp)
 	lbn = bp->b_lblkno;
 	return (lbn < 0 && (-lbn - NDADDR) % NINDIR(fs) == 2);
 }
+#endif
 
 /*
  * Allocate a new buffer header.