Fix warnings preparing for -Wall -Wcast-qual

    Also disable one usb module in LINT due to fatal compilation errors,
    temporary.

30 files changed, 134 insertions, 118 deletions

diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c
index bd25e744f015..45ba08ef2fa0 100644
--- a/sys/cam/cam_xpt.c
+++ b/sys/cam/cam_xpt.c
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: cam_xpt.c,v 1.41 1999/01/20 19:08:45 mjacob Exp $
+ *      $Id: cam_xpt.c,v 1.42 1999/01/20 23:00:31 mjacob Exp $
  */
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -4257,7 +4257,7 @@ xpt_release_simq_timeout(void *arg)
 }
 
 void
-xpt_done(union ccb *done_ccb)
+xpt_done(volatile union ccb *done_ccb)
 {
 	int s;
 
diff --git a/sys/cam/cam_xpt_sim.h b/sys/cam/cam_xpt_sim.h
index e19a8696bb61..aa9e012ed52d 100644
--- a/sys/cam/cam_xpt_sim.h
+++ b/sys/cam/cam_xpt_sim.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id$
+ *      $Id: cam_xpt_sim.h,v 1.1 1998/09/15 06:33:23 gibbs Exp $
  */
 
 #ifndef _CAM_CAM_XPT_SIM_H
@@ -43,7 +43,7 @@ u_int32_t	xpt_freeze_simq(struct cam_sim *sim, u_int count);
 void		xpt_release_simq(struct cam_sim *sim, int run_queue);
 u_int32_t	xpt_freeze_devq(struct cam_path *path, u_int count);
 void		xpt_release_devq(struct cam_ed *dev, int run_queue);
-void		xpt_done(union ccb *done_ccb);
+void		xpt_done(volatile union ccb *done_ccb);
 #endif /* KERNEL */
 
 #endif /* _CAM_CAM_XPT_SIM_H */
diff --git a/sys/coda/coda_fbsd.c b/sys/coda/coda_fbsd.c
index 66bfe07f6299..0a5a573a8cf7 100644
--- a/sys/coda/coda_fbsd.c
+++ b/sys/coda/coda_fbsd.c
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_fbsd.cr,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- *  $Id: coda_fbsd.c,v 1.10 1999/01/05 18:49:49 eivind Exp $
+ *  $Id: coda_fbsd.c,v 1.11 1999/01/17 20:25:14 peter Exp $
  * 
  */
 
@@ -84,7 +84,7 @@ int     vcdebug = 1;
 #define VCDEBUG if (vcdebug) printf
 
 static int
-codadev_modevent(module_t mod, int type, void *data)
+codadev_modevent(module_t mod, modeventtype_t type, void *data)
 {
 	dev_t dev;
 #ifdef DEVFS
diff --git a/sys/coda/coda_vnops.c b/sys/coda/coda_vnops.c
index c0cfa5e00f92..40f2878b45f8 100644
--- a/sys/coda/coda_vnops.c
+++ b/sys/coda/coda_vnops.c
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  *  	@(#) src/sys/coda/coda_vnops.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- *  $Id: coda_vnops.c,v 1.12 1999/01/07 16:14:12 bde Exp $
+ *  $Id: coda_vnops.c,v 1.13 1999/01/20 14:49:05 eivind Exp $
  * 
  */
 
@@ -48,6 +48,14 @@
 /*
  * HISTORY
  * $Log: coda_vnops.c,v $
+ * Revision 1.13  1999/01/20 14:49:05  eivind
+ * Add 'options DEBUG_LOCKS', which stores extra information in struct
+ * lock, and add some macros and function parameters to make sure that
+ * the information get to the point where it can be put in the lock
+ * structure.
+ *
+ * While I'm here, add DEBUG_VFS_LOCKS to LINT.
+ *
  * Revision 1.12  1999/01/07 16:14:12  bde
  * Don't pass unused unused timestamp args to UFS_UPDATE() or waste
  * time initializing them.  This almost finishes centralizing (in-core)
@@ -760,7 +768,7 @@ coda_ioctl(v)
     /* Should we use the name cache here? It would get it from
        lookupname sooner or later anyway, right? */
 
-    NDINIT(&ndp, LOOKUP, (iap->follow ? FOLLOW : NOFOLLOW), UIO_USERSPACE, ((caddr_t)iap->path), p);
+    NDINIT(&ndp, LOOKUP, (iap->follow ? FOLLOW : NOFOLLOW), UIO_USERSPACE, ((c_caddr_t)iap->path), p);
     error = namei(&ndp);
     tvp = ndp.ni_vp;
 
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 99019fe430c7..0afff0819cfb 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.545 1999/01/25 03:51:51 peter Exp $
+#	$Id: LINT,v 1.546 1999/01/25 19:34:26 nsouch Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -2011,7 +2011,7 @@ options DPT_SHUTDOWN_SLEEP=500
 
 # USB support
 # UHCI controller 
-controller    uhci0
+#controller    uhci0
 # OHCI controller
 controller    ohci0
 # General USB code (mandatory for USB)
diff --git a/sys/dev/ccd/ccd.c b/sys/dev/ccd/ccd.c
index 596399280562..d51687391fce 100644
--- a/sys/dev/ccd/ccd.c
+++ b/sys/dev/ccd/ccd.c
@@ -1,4 +1,4 @@
-/* $Id: ccd.c,v 1.37 1998/09/15 08:15:26 gibbs Exp $ */
+/* $Id: ccd.c,v 1.38 1999/01/22 22:38:28 peter Exp $ */
 
 /*	$NetBSD: ccd.c,v 1.22 1995/12/08 19:13:26 thorpej Exp $	*/
 
@@ -332,8 +332,8 @@ ccdinit(ccd, cpaths, p)
 		 * Copy in the pathname of the component.
 		 */
 		bzero(tmppath, sizeof(tmppath));	/* sanity */
-		if (error = copyinstr(cpaths[ix], tmppath,
-		    MAXPATHLEN, &ci->ci_pathlen)) {
+		if ((error = copyinstr(cpaths[ix], tmppath,
+		    MAXPATHLEN, &ci->ci_pathlen)) != 0) {
 #ifdef DEBUG
 			if (ccddebug & (CCDB_FOLLOW|CCDB_INIT))
 				printf("ccd%d: can't copy path, error = %d\n",
@@ -352,7 +352,7 @@ ccdinit(ccd, cpaths, p)
 		/*
 		 * XXX: Cache the component's dev_t.
 		 */
-		if (error = VOP_GETATTR(vp, &va, p->p_ucred, p)) {
+		if ((error = VOP_GETATTR(vp, &va, p->p_ucred, p)) != 0) {
 #ifdef DEBUG
 			if (ccddebug & (CCDB_FOLLOW|CCDB_INIT))
 				printf("ccd%d: %s: getattr failed %s = %d\n",
@@ -371,8 +371,8 @@ ccdinit(ccd, cpaths, p)
 		/*
 		 * Get partition information for the component.
 		 */
-		if (error = VOP_IOCTL(vp, DIOCGPART, (caddr_t)&dpart,
-		    FREAD, p->p_ucred, p)) {
+		if ((error = VOP_IOCTL(vp, DIOCGPART, (caddr_t)&dpart,
+		    FREAD, p->p_ucred, p)) != 0) {
 #ifdef DEBUG
 			if (ccddebug & (CCDB_FOLLOW|CCDB_INIT))
 				 printf("ccd%d: %s: ioctl failed, error = %d\n",
@@ -632,7 +632,7 @@ ccdopen(dev, flags, fmt, p)
 		return (ENXIO);
 	cs = &ccd_softc[unit];
 
-	if (error = ccdlock(cs))
+	if ((error = ccdlock(cs)) != 0)
 		return (error);
 
 	lp = &cs->sc_dkdev.dk_label;
@@ -693,7 +693,7 @@ ccdclose(dev, flags, fmt, p)
 		return (ENXIO);
 	cs = &ccd_softc[unit];
 
-	if (error = ccdlock(cs))
+	if ((error = ccdlock(cs)) != 0)
 		return (error);
 
 	part = ccdpart(dev);
@@ -1076,7 +1076,7 @@ ccdioctl(dev, cmd, data, flag, p)
 		if ((flag & FWRITE) == 0)
 			return (EBADF);
 
-		if (error = ccdlock(cs))
+		if ((error = ccdlock(cs)) != 0)
 			return (error);
 
 		/* Fill in some important bits. */
@@ -1131,7 +1131,7 @@ ccdioctl(dev, cmd, data, flag, p)
 			if (ccddebug & CCDB_INIT)
 				printf("ccdioctl: lookedup = %d\n", lookedup);
 #endif
-			if (error = ccdlookup(cpp[i], p, &vpp[i])) {
+			if ((error = ccdlookup(cpp[i], p, &vpp[i])) != 0) {
 				for (j = 0; j < lookedup; ++j)
 					(void)vn_close(vpp[j], FREAD|FWRITE,
 					    p->p_ucred, p);
@@ -1149,7 +1149,7 @@ ccdioctl(dev, cmd, data, flag, p)
 		/*
 		 * Initialize the ccd.  Fills in the softc for us.
 		 */
-		if (error = ccdinit(&ccd, cpp, p)) {
+		if ((error = ccdinit(&ccd, cpp, p)) != 0) {
 			for (j = 0; j < lookedup; ++j)
 				(void)vn_close(vpp[j], FREAD|FWRITE,
 				    p->p_ucred, p);
@@ -1180,7 +1180,7 @@ ccdioctl(dev, cmd, data, flag, p)
 		if ((flag & FWRITE) == 0)
 			return (EBADF);
 
-		if (error = ccdlock(cs))
+		if ((error = ccdlock(cs)) != 0)
 			return (error);
 
 		/*
@@ -1267,7 +1267,7 @@ ccdioctl(dev, cmd, data, flag, p)
 		if ((flag & FWRITE) == 0)
 			return (EBADF);
 
-		if (error = ccdlock(cs))
+		if ((error = ccdlock(cs)) != 0)
 			return (error);
 
 		cs->sc_flags |= CCDF_LABELLING;
@@ -1363,7 +1363,7 @@ ccdlookup(path, p, vpp)
 	int error;
 
 	NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, path, p);
-	if (error = vn_open(&nd, FREAD|FWRITE, 0)) {
+	if ((error = vn_open(&nd, FREAD|FWRITE, 0)) != 0) {
 #ifdef DEBUG
 		if (ccddebug & CCDB_FOLLOW|CCDB_INIT)
 			printf("ccdlookup: vn_open error = %d\n", error);
@@ -1378,7 +1378,7 @@ ccdlookup(path, p, vpp)
 		return (EBUSY);
 	}
 
-	if (error = VOP_GETATTR(vp, &va, p->p_ucred, p)) {
+	if ((error = VOP_GETATTR(vp, &va, p->p_ucred, p)) != 0) {
 #ifdef DEBUG
 		if (ccddebug & CCDB_FOLLOW|CCDB_INIT)
 			printf("ccdlookup: getattr error = %d\n", error);
@@ -1450,8 +1450,8 @@ ccdgetdisklabel(dev)
 	/*
 	 * Call the generic disklabel extraction routine.
 	 */
-	if (errstring = readdisklabel(CCDLABELDEV(dev), ccdstrategy,
-	    &cs->sc_dkdev.dk_label))
+	if ((errstring = readdisklabel(CCDLABELDEV(dev), ccdstrategy,
+	    &cs->sc_dkdev.dk_label)) != NULL)
 		ccdmakedisklabel(cs);
 
 #ifdef DEBUG
diff --git a/sys/dev/en/midway.c b/sys/dev/en/midway.c
index 44a465927ca4..e869f6436675 100644
--- a/sys/dev/en/midway.c
+++ b/sys/dev/en/midway.c
@@ -1274,7 +1274,7 @@ caddr_t data;
 		do {
 			struct ifnet *shadow;
 		    
-			if (error = suser(curproc->p_ucred, &curproc->p_acflag))
+			if ((error = suser(curproc->p_ucred, &curproc->p_acflag)) != 0)
 				break;
 		    
 			if ((shadow = pvc_attach(ifp)) != NULL) {
diff --git a/sys/dev/hea/eni_if.c b/sys/dev/hea/eni_if.c
index 49f5e09516cd..00f92337a221 100644
--- a/sys/dev/hea/eni_if.c
+++ b/sys/dev/hea/eni_if.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: eni_if.c,v 1.2 1998/10/31 20:06:45 phk Exp $
+ *	@(#) $Id: eni_if.c,v 1.3 1998/12/04 22:54:45 archie Exp $
  *
  */
 
@@ -43,7 +43,7 @@
 #include <dev/hea/eni_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: eni_if.c,v 1.2 1998/10/31 20:06:45 phk Exp $");
+__RCSID("@(#) $Id: eni_if.c,v 1.3 1998/12/04 22:54:45 archie Exp $");
 #endif
 
 static void	eni_get_stats __P((Eni_unit *));
@@ -216,7 +216,7 @@ eni_atm_ioctl ( code, data, arg )
 		/*
 		 * Copy interface name into response structure
 		 */
-		if ( err = copyout ( ifname, avr->avsp_intf, IFNAMSIZ ) )
+		if ((err = copyout(ifname, avr->avsp_intf, IFNAMSIZ)) != 0)
 			break;
 
 		/*
@@ -239,8 +239,7 @@ eni_atm_ioctl ( code, data, arg )
 		 * Copy stats into user's buffer. Return value is
 		 * amount of data copied.
 		 */
-		if ( err = copyout ((void *)&eup->eu_stats, buf,
-			count))
+		if ((err = copyout((void *)&eup->eu_stats, buf, count)) != 0)
 				break;
 		buf += count;
 		buf_len -= count;
@@ -250,7 +249,7 @@ eni_atm_ioctl ( code, data, arg )
 		/*
 		 * Record amount we're returning as vendor info...
 		 */
-		if (err = copyout(&count, &avr->avsp_len, sizeof(int)))
+		if ((err = copyout(&count, &avr->avsp_len, sizeof(int))) != 0)
 			break;
 
 		/*
diff --git a/sys/dev/hea/eni_receive.c b/sys/dev/hea/eni_receive.c
index 8e8be36d6577..883602bb065a 100644
--- a/sys/dev/hea/eni_receive.c
+++ b/sys/dev/hea/eni_receive.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: eni_receive.c,v 1.2 1998/09/17 09:34:58 phk Exp $
+ *	@(#) $Id: eni_receive.c,v 1.3 1998/10/31 20:06:45 phk Exp $
  *
  */
 
@@ -42,7 +42,7 @@
 #include <dev/hea/eni_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: eni_receive.c,v 1.2 1998/09/17 09:34:58 phk Exp $");
+__RCSID("@(#) $Id: eni_receive.c,v 1.3 1998/10/31 20:06:45 phk Exp $");
 #endif
 
 static void	eni_recv_stack __P((void *, KBuffer *));
@@ -114,8 +114,8 @@ eni_do_service ( eup )
 		 * VCC into TRASH mode.
 		 */
 		if ( ( vci_hdr & VCI_IN_SERVICE ) == 0 ||
-		    ( vci_hdr & ~VCI_MODE_MASK ==
-			VCI_MODE_TRASH << VCI_MODE_SHIFT ) )
+		    ( (vci_hdr & ~VCI_MODE_MASK) ==
+			(VCI_MODE_TRASH << VCI_MODE_SHIFT) ) )
 			    goto next_vcc;
 
 		/*
diff --git a/sys/dev/hea/eni_transmit.c b/sys/dev/hea/eni_transmit.c
index 2721709a8fd6..f44ec41223e4 100644
--- a/sys/dev/hea/eni_transmit.c
+++ b/sys/dev/hea/eni_transmit.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: eni_transmit.c,v 1.2 1998/10/18 11:58:57 phk Exp $
+ *	@(#) $Id: eni_transmit.c,v 1.3 1998/10/31 20:06:45 phk Exp $
  *
  */
 
@@ -43,7 +43,7 @@
 #include <dev/hea/eni_var.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: eni_transmit.c,v 1.2 1998/10/18 11:58:57 phk Exp $");
+__RCSID("@(#) $Id: eni_transmit.c,v 1.3 1998/10/31 20:06:45 phk Exp $");
 #endif
 
 /*
@@ -463,7 +463,7 @@ retry:
 		 * Get start of data onto full-word alignment
 		 */
 		KB_DATASTART ( m, cp, caddr_t );
-		if ( align = ((u_int)cp) & (sizeof(u_long)-1)) {
+		if ((align = ((u_int)cp) & (sizeof(u_long)-1)) != 0) {
 			/*
 			 * Gotta slide the data up
 			 */
@@ -622,7 +622,7 @@ retry:
 	 * AAL5 PDUs need an extra two words for control/length and
 	 * CRC. Check for AAL5 and add requirements here.
 	 */
-	if (aal5 = (evp->ev_connvc->cvc_attr.aal.type == ATM_AAL5))
+	if ((aal5 = (evp->ev_connvc->cvc_attr.aal.type == ATM_AAL5)) != 0)
 		size = pdulen + 2 * sizeof(long);
 	else
 		size = pdulen;
diff --git a/sys/dev/hfa/fore_buffer.c b/sys/dev/hfa/fore_buffer.c
index 6952f01cc23d..ccf91b372e28 100644
--- a/sys/dev/hfa/fore_buffer.c
+++ b/sys/dev/hfa/fore_buffer.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_buffer.c,v 1.1 1998/09/15 08:22:54 phk Exp $
+ *	@(#) $Id: fore_buffer.c,v 1.2 1998/10/31 20:06:52 phk Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: fore_buffer.c,v 1.1 1998/09/15 08:22:54 phk Exp $");
+__RCSID("@(#) $Id: fore_buffer.c,v 1.2 1998/10/31 20:06:52 phk Exp $");
 #endif
 
 
@@ -690,7 +690,7 @@ fore_buf_free(fup)
 		/*
 		 * Run through Strategy 1 Small queue
 		 */
-		while (bhp = Q_HEAD(fup->fu_buf1s_bq, Buf_handle)) {
+		while ((bhp = Q_HEAD(fup->fu_buf1s_bq, Buf_handle)) != NULL) {
 			caddr_t		cp;
 
 			/*
@@ -712,7 +712,7 @@ fore_buf_free(fup)
 		/*
 		 * Run through Strategy 1 Large queue
 		 */
-		while (bhp = Q_HEAD(fup->fu_buf1l_bq, Buf_handle)) {
+		while ((bhp = Q_HEAD(fup->fu_buf1l_bq, Buf_handle)) != NULL) {
 			caddr_t		cp;
 
 			/*
@@ -742,7 +742,7 @@ fore_buf_free(fup)
 					(BUF1_SM_QUELEN + BUF1_LG_QUELEN),
 				ATM_DEV_NONCACHE);
 		}
-		atm_dev_free((void *)fup->fu_buf1s_stat);
+		atm_dev_free((volatile void *)fup->fu_buf1s_stat);
 		fup->fu_buf1s_stat = NULL;
 		fup->fu_buf1s_statd = NULL;
 		fup->fu_buf1l_stat = NULL;
diff --git a/sys/dev/hfa/fore_command.c b/sys/dev/hfa/fore_command.c
index d8e0e9d3cd2e..bb4187f4fc36 100644
--- a/sys/dev/hfa/fore_command.c
+++ b/sys/dev/hfa/fore_command.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_command.c,v 1.3 1998/10/31 20:06:52 phk Exp $
+ *	@(#) $Id: fore_command.c,v 1.4 1998/12/04 22:54:45 archie Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: fore_command.c,v 1.3 1998/10/31 20:06:52 phk Exp $");
+__RCSID("@(#) $Id: fore_command.c,v 1.4 1998/12/04 22:54:45 archie Exp $");
 #endif
 
 /*
@@ -437,7 +437,7 @@ fore_cmd_free(fup)
 				sizeof(Q_status) * CMD_QUELEN,
 				ATM_DEV_NONCACHE);
 		}
-		atm_dev_free((void *)fup->fu_cmd_stat);
+		atm_dev_free((volatile void *)fup->fu_cmd_stat);
 		fup->fu_cmd_stat = NULL;
 		fup->fu_cmd_statd = NULL;
 	}
diff --git a/sys/dev/hfa/fore_if.c b/sys/dev/hfa/fore_if.c
index 479e7e672f81..2c4a9de21964 100644
--- a/sys/dev/hfa/fore_if.c
+++ b/sys/dev/hfa/fore_if.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_if.c,v 1.2 1998/10/31 20:06:52 phk Exp $
+ *	@(#) $Id: fore_if.c,v 1.3 1998/12/04 22:54:45 archie Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: fore_if.c,v 1.2 1998/10/31 20:06:52 phk Exp $");
+__RCSID("@(#) $Id: fore_if.c,v 1.3 1998/12/04 22:54:45 archie Exp $");
 #endif
 
 
@@ -107,7 +107,7 @@ fore_atm_ioctl(code, data, arg)
 		/*
 		 * Copy interface name into response structure
 		 */
-		if ( err = copyout ( ifname, avr->avsp_intf, IFNAMSIZ ) )
+		if ((err = copyout ( ifname, avr->avsp_intf, IFNAMSIZ)) != 0)
 			break;
 
 		/*
@@ -132,7 +132,7 @@ fore_atm_ioctl(code, data, arg)
 			 * Copy stats into user's buffer. Return value is
 			 * amount of data copied.
 			 */
-			if (err = copyout((caddr_t)fup->fu_stats, buf, count))
+			if ((err = copyout((caddr_t)fup->fu_stats, buf, count)) != 0)
 				break;
 			buf += count;
 			buf_len -= count;
@@ -143,7 +143,7 @@ fore_atm_ioctl(code, data, arg)
 		/*
 		 * Record amount we're returning as vendor info...
 		 */
-		if (err = copyout(&count, &avr->avsp_len, sizeof(int)))
+		if ((err = copyout(&count, &avr->avsp_len, sizeof(int))) != 0)
 			break;
 
 		/*
diff --git a/sys/dev/hfa/fore_output.c b/sys/dev/hfa/fore_output.c
index d92d5a01ca48..0a5bcd2ca86c 100644
--- a/sys/dev/hfa/fore_output.c
+++ b/sys/dev/hfa/fore_output.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_output.c,v 1.1 1998/09/15 08:22:55 phk Exp $
+ *	@(#) $Id: fore_output.c,v 1.2 1998/10/31 20:06:53 phk Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: fore_output.c,v 1.1 1998/09/15 08:22:55 phk Exp $");
+__RCSID("@(#) $Id: fore_output.c,v 1.2 1998/10/31 20:06:53 phk Exp $");
 #endif
 
 
@@ -301,7 +301,7 @@ retry:
 		 * Get start of data onto full-word alignment
 		 */
 		KB_DATASTART(m, cp, caddr_t);
-		if (align = ((u_int)cp) & (XMIT_SEG_ALIGN - 1)) {
+		if ((align = ((u_int)cp) & (XMIT_SEG_ALIGN - 1)) != 0) {
 			/*
 			 * Gotta slide the data up
 			 */
diff --git a/sys/dev/hfa/fore_receive.c b/sys/dev/hfa/fore_receive.c
index 431a03f17cba..a86545c6db7a 100644
--- a/sys/dev/hfa/fore_receive.c
+++ b/sys/dev/hfa/fore_receive.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_receive.c,v 1.2 1998/09/17 09:34:59 phk Exp $
+ *	@(#) $Id: fore_receive.c,v 1.3 1998/10/31 20:06:53 phk Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: fore_receive.c,v 1.2 1998/09/17 09:34:59 phk Exp $");
+__RCSID("@(#) $Id: fore_receive.c,v 1.3 1998/10/31 20:06:53 phk Exp $");
 #endif
 
 
@@ -559,7 +559,7 @@ fore_recv_free(fup)
 				sizeof(Q_status) * RECV_QUELEN,
 				ATM_DEV_NONCACHE);
 		}
-		atm_dev_free((void *)fup->fu_recv_stat);
+		atm_dev_free((volatile void *)fup->fu_recv_stat);
 		fup->fu_recv_stat = NULL;
 		fup->fu_recv_statd = NULL;
 	}
diff --git a/sys/dev/hfa/fore_transmit.c b/sys/dev/hfa/fore_transmit.c
index bced06c25e67..4be4a8984892 100644
--- a/sys/dev/hfa/fore_transmit.c
+++ b/sys/dev/hfa/fore_transmit.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: fore_transmit.c,v 1.1 1998/09/15 08:22:56 phk Exp $
+ *	@(#) $Id: fore_transmit.c,v 1.2 1998/10/31 20:06:53 phk Exp $
  *
  */
 
@@ -38,7 +38,7 @@
 #include <dev/hfa/fore_include.h>
 
 #ifndef lint
-__RCSID("@(#) $Id: fore_transmit.c,v 1.1 1998/09/15 08:22:56 phk Exp $");
+__RCSID("@(#) $Id: fore_transmit.c,v 1.2 1998/10/31 20:06:53 phk Exp $");
 #endif
 
 
@@ -340,7 +340,7 @@ fore_xmit_free(fup)
 				sizeof(Q_status) * XMIT_QUELEN,
 				ATM_DEV_NONCACHE);
 		}
-		atm_dev_free((void *)fup->fu_xmit_stat);
+		atm_dev_free((volatile void *)fup->fu_xmit_stat);
 		fup->fu_xmit_stat = NULL;
 		fup->fu_xmit_statd = NULL;
 	}
diff --git a/sys/dev/ppbus/nlpt.c b/sys/dev/ppbus/nlpt.c
index 89d6c7f5a5a3..4a4e0fffd35f 100644
--- a/sys/dev/ppbus/nlpt.c
+++ b/sys/dev/ppbus/nlpt.c
@@ -47,7 +47,7 @@
  *
  *	from: unknown origin, 386BSD 0.1
  *	From Id: lpt.c,v 1.55.2.1 1996/11/12 09:08:38 phk Exp
- *	$Id: nlpt.c,v 1.11 1998/12/04 22:00:33 archie Exp $
+ *	$Id: nlpt.c,v 1.12 1999/01/10 12:04:54 nsouch Exp $
  */
 
 /*
@@ -467,7 +467,7 @@ nlptopen(dev_t dev, int flags, int fmt, struct proc *p)
 	}
 
 	/* request the ppbus only if we don't have it already */
-	if (err = lpt_request_ppbus(sc, PPB_WAIT|PPB_INTR))
+	if ((err = lpt_request_ppbus(sc, PPB_WAIT|PPB_INTR)) != 0)
 		return (err);
 
 	s = spltty();
@@ -564,7 +564,7 @@ nlptclose(dev_t dev, int flags, int fmt, struct proc *p)
 	if(sc->sc_flags & LP_BYPASS)
 		goto end_close;
 
-	if (err = lpt_request_ppbus(sc, PPB_WAIT|PPB_INTR))
+	if ((err = lpt_request_ppbus(sc, PPB_WAIT|PPB_INTR)) != 0)
 		return (err);
 
 	sc->sc_state &= ~OPEN;
@@ -708,7 +708,7 @@ nlptwrite(dev_t dev, struct uio *uio, int ioflag)
 	}
 
 	/* request the ppbus only if we don't have it already */
-	if (err = lpt_request_ppbus(sc, PPB_WAIT|PPB_INTR))
+	if ((err = lpt_request_ppbus(sc, PPB_WAIT|PPB_INTR)) != 0)
 		return (err);
 
 	sc->sc_state &= ~INTERRUPTED;
diff --git a/sys/dev/ppbus/ppb_base.c b/sys/dev/ppbus/ppb_base.c
index 83fc26ef0294..e5d2111a2797 100644
--- a/sys/dev/ppbus/ppb_base.c
+++ b/sys/dev/ppbus/ppb_base.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppb_base.c,v 1.5 1998/09/13 18:26:26 nsouch Exp $
+ *	$Id: ppb_base.c,v 1.6 1999/01/10 12:04:54 nsouch Exp $
  *
  */
 #include <sys/param.h>
@@ -98,9 +98,10 @@ ppb_poll_device(struct ppb_device *dev, int max,
 		case PPB_INTR:
 		default:
 			/* wait 10 ms */
-			if ((error = tsleep((caddr_t)dev, PPBPRI | PCATCH,
-					"ppbpoll", hz/100)) != EWOULDBLOCK)
+			if (((error = tsleep((caddr_t)dev, PPBPRI | PCATCH,
+			    "ppbpoll", hz/100)) != EWOULDBLOCK) != 0) {
 				return (error);
+			}
 			break;
 		}
 	   }
diff --git a/sys/dev/ppbus/ppb_msq.c b/sys/dev/ppbus/ppb_msq.c
index addcf041ab48..e0893e702f19 100644
--- a/sys/dev/ppbus/ppb_msq.c
+++ b/sys/dev/ppbus/ppb_msq.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppb_msq.c,v 1.3 1998/09/20 14:41:54 nsouch Exp $
+ *	$Id: ppb_msq.c,v 1.4 1999/01/10 12:04:54 nsouch Exp $
  *
  */
 #include <machine/stdarg.h>
@@ -128,7 +128,7 @@ ppb_MS_exec(struct ppb_device *dev, int opcode, union ppb_insarg param1,
 		union ppb_insarg param2, union ppb_insarg param3, int *ret)
 {
 	struct ppb_microseq msq[] = {
-		  { MS_UNKNOWN, { MS_UNKNOWN, MS_UNKNOWN, MS_UNKNOWN } },
+		  { MS_UNKNOWN, { { MS_UNKNOWN }, { MS_UNKNOWN }, { MS_UNKNOWN } } },
 		  MS_RET(0)
 	};
 
diff --git a/sys/dev/vinum/vinumconfig.c b/sys/dev/vinum/vinumconfig.c
index 32e56b925056..5ceaf5fb3847 100644
--- a/sys/dev/vinum/vinumconfig.c
+++ b/sys/dev/vinum/vinumconfig.c
@@ -44,7 +44,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $Id: vinumconfig.c,v 1.22 1998/12/30 05:07:24 grog Exp grog $
+ * $Id: vinumconfig.c,v 1.8 1999/01/21 00:32:54 grog Exp $
  */
 
 #define STATIC						    /* nothing while we're testing XXX */
@@ -244,8 +244,8 @@ my_sd(int plexno, int sdno)
 void 
 checkkernel(char *op)
 {
-    if (vinum_conf.flags & VF_KERNELOP == 0)
-    throw_rude_remark(EPERM, "Can't perform '%s' from user space", op);
+    if ((vinum_conf.flags & VF_KERNELOP) == 0)
+	    throw_rude_remark(EPERM, "Can't perform '%s' from user space", op);
 }
 
 /* Add plex to the volume if possible */
@@ -267,7 +267,7 @@ give_plex_to_volume(int volno, int plexno)
 	    "Too many plexes for volume %s",
 	    vol->name);
     else if ((vol->plexes > 0)				    /* we have other plexes */
-    &&(vol->flags & VF_CONFIG_SETUPSTATE == 0))		    /* and we're not setting up state */
+    &&((vol->flags & VF_CONFIG_SETUPSTATE) == 0))		    /* and we're not setting up state */
 	invalidate_subdisks(&PLEX[plexno], sd_stale);	    /* make the subdisks invalid */
     vol->plex[vol->plexes] = plexno;			    /* this one */
     vol->plexes++;					    /* add another plex */
diff --git a/sys/dev/vinum/vinumio.c b/sys/dev/vinum/vinumio.c
index 013836bb2873..0856eb9b6c12 100644
--- a/sys/dev/vinum/vinumio.c
+++ b/sys/dev/vinum/vinumio.c
@@ -33,7 +33,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $Id: vinumio.c,v 1.7 1999/01/21 00:34:50 grog Exp $
+ * $Id: vinumio.c,v 1.8 1999/01/23 01:29:05 peter Exp $
  */
 
 #define STATIC						    /* nothing while we're testing XXX */
@@ -507,7 +507,7 @@ check_drive(char *drivename)
 static char *
 sappend(char *txt, char *s)
 {
-    while (*s++ = *txt++);
+    while ((*s++ = *txt++) != 0);
     return s - 1;
 }
 
@@ -1017,8 +1017,8 @@ vinum_scandisk(char *drivename[], int drives)
 int 
 drivecmp(const void *va, const void *vb)
 {
-    struct drive *a = *(struct drive **) va;
-    struct drive *b = *(struct drive **) vb;
+    const struct drive *a = *(const struct drive * const *) va;
+    const struct drive *b = *(const struct drive * const *) vb;
 
     if ((a->label.last_update.tv_sec == b->label.last_update.tv_sec)
 	&& (a->label.last_update.tv_usec == b->label.last_update.tv_usec))
diff --git a/sys/dev/vinum/vinumstate.c b/sys/dev/vinum/vinumstate.c
index 8d44fecfcdf2..d71a5615e6ce 100644
--- a/sys/dev/vinum/vinumstate.c
+++ b/sys/dev/vinum/vinumstate.c
@@ -33,7 +33,7 @@
  * otherwise) arising in any way out of the use of this software, even if
  * advised of the possibility of such damage.
  *
- * $Id: vinumstate.c,v 2.10 1999/01/17 06:19:23 grog Exp grog $
+ * $Id: vinumstate.c,v 1.7 1999/01/21 00:40:32 grog Exp $
  */
 
 #define REALLYKERNEL
@@ -204,7 +204,7 @@ set_sd_state(int sdno, enum sdstate newstate, enum setstateflags flags)
 	    break;
 
 	default:					    /* other ones, only internal with force */
-	    if (flags & setstate_force == 0)		    /* no force?  What's this? */
+	    if ((flags & setstate_force) == 0)		    /* no force?  What's this? */
 		return 0;				    /* don't do it */
 	}
     }
@@ -396,7 +396,7 @@ update_plex_state(int plexno)
 
 	    for (plexno = 0; plexno < vol->plexes; plexno++)
 		PLEX[vol->plex[plexno]].state = plex_up;
-	} else if (vps & volplex_otherup == 0) {	    /* no other plexes up */
+	} else if ((vps & volplex_otherup) == 0) {	    /* no other plexes up */
 	    int sdno;
 
 	    plex->state = plex_up;			    /* we can call that up */
@@ -406,7 +406,7 @@ update_plex_state(int plexno)
 	    }
 	} else
 	    plex->state = plex_faulty;			    /* no, it's down */
-    } else if (statemap & (sd_upstate | sd_rebornstate) == statemap) /* all up or reborn */
+    } else if ((statemap & (sd_upstate | sd_rebornstate)) == statemap) /* all up or reborn */
 	plex->state = plex_flaky;
     else if (statemap & (sd_upstate | sd_rebornstate))	    /* some up or reborn */
 	plex->state = plex_corrupt;			    /* corrupt */
diff --git a/sys/dev/vx/if_vx.c b/sys/dev/vx/if_vx.c
index b1d056fc8ba5..c4018392c676 100644
--- a/sys/dev/vx/if_vx.c
+++ b/sys/dev/vx/if_vx.c
@@ -27,7 +27,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_vx.c,v 1.18 1998/07/13 09:52:53 bde Exp $
+ * $Id: if_vx.c,v 1.19 1999/01/12 02:09:31 eivind Exp $
  *
  */
 
@@ -325,10 +325,10 @@ vxgetlink(sc)
 			>> INTERNAL_CONNECTOR_BITS;
     if (sc->vx_connector & 0x10) {
 	sc->vx_connector &= 0x0f;
-	printf("[*%s*]", conn_tab[sc->vx_connector].name);
+	printf("[*%s*]", conn_tab[(int)sc->vx_connector].name);
 	printf(": disable 'auto select' with DOS util!");
     } else {
-	printf("[*%s*]", conn_tab[sc->vx_connector].name);
+	printf("[*%s*]", conn_tab[(int)sc->vx_connector].name);
     }
 }
 
@@ -388,7 +388,7 @@ vxsetlink(sc)
 	} else {
 	    warning = "utp not present! (link2)";
 	}
-    } else if ((sc->vx_connectors & conn_tab[sc->vx_connector].bit) == 0) {
+    } else if ((sc->vx_connectors & conn_tab[(int)sc->vx_connector].bit) == 0) {
 	warning = "strange connector type in EEPROM.";
 	reason = "forced";
 	i = CONNECTOR_UTP;
diff --git a/sys/fs/coda/coda_fbsd.c b/sys/fs/coda/coda_fbsd.c
index 66bfe07f6299..0a5a573a8cf7 100644
--- a/sys/fs/coda/coda_fbsd.c
+++ b/sys/fs/coda/coda_fbsd.c
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  * 	@(#) src/sys/coda/coda_fbsd.cr,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- *  $Id: coda_fbsd.c,v 1.10 1999/01/05 18:49:49 eivind Exp $
+ *  $Id: coda_fbsd.c,v 1.11 1999/01/17 20:25:14 peter Exp $
  * 
  */
 
@@ -84,7 +84,7 @@ int     vcdebug = 1;
 #define VCDEBUG if (vcdebug) printf
 
 static int
-codadev_modevent(module_t mod, int type, void *data)
+codadev_modevent(module_t mod, modeventtype_t type, void *data)
 {
 	dev_t dev;
 #ifdef DEVFS
diff --git a/sys/fs/coda/coda_vnops.c b/sys/fs/coda/coda_vnops.c
index c0cfa5e00f92..40f2878b45f8 100644
--- a/sys/fs/coda/coda_vnops.c
+++ b/sys/fs/coda/coda_vnops.c
@@ -27,7 +27,7 @@
  * Mellon the rights to redistribute these changes without encumbrance.
  * 
  *  	@(#) src/sys/coda/coda_vnops.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $
- *  $Id: coda_vnops.c,v 1.12 1999/01/07 16:14:12 bde Exp $
+ *  $Id: coda_vnops.c,v 1.13 1999/01/20 14:49:05 eivind Exp $
  * 
  */
 
@@ -48,6 +48,14 @@
 /*
  * HISTORY
  * $Log: coda_vnops.c,v $
+ * Revision 1.13  1999/01/20 14:49:05  eivind
+ * Add 'options DEBUG_LOCKS', which stores extra information in struct
+ * lock, and add some macros and function parameters to make sure that
+ * the information get to the point where it can be put in the lock
+ * structure.
+ *
+ * While I'm here, add DEBUG_VFS_LOCKS to LINT.
+ *
  * Revision 1.12  1999/01/07 16:14:12  bde
  * Don't pass unused unused timestamp args to UFS_UPDATE() or waste
  * time initializing them.  This almost finishes centralizing (in-core)
@@ -760,7 +768,7 @@ coda_ioctl(v)
     /* Should we use the name cache here? It would get it from
        lookupname sooner or later anyway, right? */
 
-    NDINIT(&ndp, LOOKUP, (iap->follow ? FOLLOW : NOFOLLOW), UIO_USERSPACE, ((caddr_t)iap->path), p);
+    NDINIT(&ndp, LOOKUP, (iap->follow ? FOLLOW : NOFOLLOW), UIO_USERSPACE, ((c_caddr_t)iap->path), p);
     error = namei(&ndp);
     tvp = ndp.ni_vp;
 
diff --git a/sys/geom/geom_ccd.c b/sys/geom/geom_ccd.c
index 596399280562..d51687391fce 100644
--- a/sys/geom/geom_ccd.c
+++ b/sys/geom/geom_ccd.c
@@ -1,4 +1,4 @@
-/* $Id: ccd.c,v 1.37 1998/09/15 08:15:26 gibbs Exp $ */
+/* $Id: ccd.c,v 1.38 1999/01/22 22:38:28 peter Exp $ */
 
 /*	$NetBSD: ccd.c,v 1.22 1995/12/08 19:13:26 thorpej Exp $	*/
 
@@ -332,8 +332,8 @@ ccdinit(ccd, cpaths, p)
 		 * Copy in the pathname of the component.
 		 */
 		bzero(tmppath, sizeof(tmppath));	/* sanity */
-		if (error = copyinstr(cpaths[ix], tmppath,
-		    MAXPATHLEN, &ci->ci_pathlen)) {
+		if ((error = copyinstr(cpaths[ix], tmppath,
+		    MAXPATHLEN, &ci->ci_pathlen)) != 0) {
 #ifdef DEBUG
 			if (ccddebug & (CCDB_FOLLOW|CCDB_INIT))
 				printf("ccd%d: can't copy path, error = %d\n",
@@ -352,7 +352,7 @@ ccdinit(ccd, cpaths, p)
 		/*
 		 * XXX: Cache the component's dev_t.
 		 */
-		if (error = VOP_GETATTR(vp, &va, p->p_ucred, p)) {
+		if ((error = VOP_GETATTR(vp, &va, p->p_ucred, p)) != 0) {
 #ifdef DEBUG
 			if (ccddebug & (CCDB_FOLLOW|CCDB_INIT))
 				printf("ccd%d: %s: getattr failed %s = %d\n",
@@ -371,8 +371,8 @@ ccdinit(ccd, cpaths, p)
 		/*
 		 * Get partition information for the component.
 		 */
-		if (error = VOP_IOCTL(vp, DIOCGPART, (caddr_t)&dpart,
-		    FREAD, p->p_ucred, p)) {
+		if ((error = VOP_IOCTL(vp, DIOCGPART, (caddr_t)&dpart,
+		    FREAD, p->p_ucred, p)) != 0) {
 #ifdef DEBUG
 			if (ccddebug & (CCDB_FOLLOW|CCDB_INIT))
 				 printf("ccd%d: %s: ioctl failed, error = %d\n",
@@ -632,7 +632,7 @@ ccdopen(dev, flags, fmt, p)
 		return (ENXIO);
 	cs = &ccd_softc[unit];
 
-	if (error = ccdlock(cs))
+	if ((error = ccdlock(cs)) != 0)
 		return (error);
 
 	lp = &cs->sc_dkdev.dk_label;
@@ -693,7 +693,7 @@ ccdclose(dev, flags, fmt, p)
 		return (ENXIO);
 	cs = &ccd_softc[unit];
 
-	if (error = ccdlock(cs))
+	if ((error = ccdlock(cs)) != 0)
 		return (error);
 
 	part = ccdpart(dev);
@@ -1076,7 +1076,7 @@ ccdioctl(dev, cmd, data, flag, p)
 		if ((flag & FWRITE) == 0)
 			return (EBADF);
 
-		if (error = ccdlock(cs))
+		if ((error = ccdlock(cs)) != 0)
 			return (error);
 
 		/* Fill in some important bits. */
@@ -1131,7 +1131,7 @@ ccdioctl(dev, cmd, data, flag, p)
 			if (ccddebug & CCDB_INIT)
 				printf("ccdioctl: lookedup = %d\n", lookedup);
 #endif
-			if (error = ccdlookup(cpp[i], p, &vpp[i])) {
+			if ((error = ccdlookup(cpp[i], p, &vpp[i])) != 0) {
 				for (j = 0; j < lookedup; ++j)
 					(void)vn_close(vpp[j], FREAD|FWRITE,
 					    p->p_ucred, p);
@@ -1149,7 +1149,7 @@ ccdioctl(dev, cmd, data, flag, p)
 		/*
 		 * Initialize the ccd.  Fills in the softc for us.
 		 */
-		if (error = ccdinit(&ccd, cpp, p)) {
+		if ((error = ccdinit(&ccd, cpp, p)) != 0) {
 			for (j = 0; j < lookedup; ++j)
 				(void)vn_close(vpp[j], FREAD|FWRITE,
 				    p->p_ucred, p);
@@ -1180,7 +1180,7 @@ ccdioctl(dev, cmd, data, flag, p)
 		if ((flag & FWRITE) == 0)
 			return (EBADF);
 
-		if (error = ccdlock(cs))
+		if ((error = ccdlock(cs)) != 0)
 			return (error);
 
 		/*
@@ -1267,7 +1267,7 @@ ccdioctl(dev, cmd, data, flag, p)
 		if ((flag & FWRITE) == 0)
 			return (EBADF);
 
-		if (error = ccdlock(cs))
+		if ((error = ccdlock(cs)) != 0)
 			return (error);
 
 		cs->sc_flags |= CCDF_LABELLING;
@@ -1363,7 +1363,7 @@ ccdlookup(path, p, vpp)
 	int error;
 
 	NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, path, p);
-	if (error = vn_open(&nd, FREAD|FWRITE, 0)) {
+	if ((error = vn_open(&nd, FREAD|FWRITE, 0)) != 0) {
 #ifdef DEBUG
 		if (ccddebug & CCDB_FOLLOW|CCDB_INIT)
 			printf("ccdlookup: vn_open error = %d\n", error);
@@ -1378,7 +1378,7 @@ ccdlookup(path, p, vpp)
 		return (EBUSY);
 	}
 
-	if (error = VOP_GETATTR(vp, &va, p->p_ucred, p)) {
+	if ((error = VOP_GETATTR(vp, &va, p->p_ucred, p)) != 0) {
 #ifdef DEBUG
 		if (ccddebug & CCDB_FOLLOW|CCDB_INIT)
 			printf("ccdlookup: getattr error = %d\n", error);
@@ -1450,8 +1450,8 @@ ccdgetdisklabel(dev)
 	/*
 	 * Call the generic disklabel extraction routine.
 	 */
-	if (errstring = readdisklabel(CCDLABELDEV(dev), ccdstrategy,
-	    &cs->sc_dkdev.dk_label))
+	if ((errstring = readdisklabel(CCDLABELDEV(dev), ccdstrategy,
+	    &cs->sc_dkdev.dk_label)) != NULL)
 		ccdmakedisklabel(cs);
 
 #ifdef DEBUG
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 99019fe430c7..0afff0819cfb 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.545 1999/01/25 03:51:51 peter Exp $
+#	$Id: LINT,v 1.546 1999/01/25 19:34:26 nsouch Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -2011,7 +2011,7 @@ options DPT_SHUTDOWN_SLEEP=500
 
 # USB support
 # UHCI controller 
-controller    uhci0
+#controller    uhci0
 # OHCI controller
 controller    ohci0
 # General USB code (mandatory for USB)
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 99019fe430c7..0afff0819cfb 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -2,7 +2,7 @@
 # LINT -- config file for checking all the sources, tries to pull in
 #	as much of the source tree as it can.
 #
-#	$Id: LINT,v 1.545 1999/01/25 03:51:51 peter Exp $
+#	$Id: LINT,v 1.546 1999/01/25 19:34:26 nsouch Exp $
 #
 # NB: You probably don't want to try running a kernel built from this
 # file.  Instead, you should start from GENERIC, and add options from
@@ -2011,7 +2011,7 @@ options DPT_SHUTDOWN_SLEEP=500
 
 # USB support
 # UHCI controller 
-controller    uhci0
+#controller    uhci0
 # OHCI controller
 controller    ohci0
 # General USB code (mandatory for USB)
diff --git a/sys/pci/pcisupport.c b/sys/pci/pcisupport.c
index 529bc205a8e7..ee19a44c4a56 100644
--- a/sys/pci/pcisupport.c
+++ b/sys/pci/pcisupport.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: pcisupport.c,v 1.87 1999/01/25 19:34:25 nsouch Exp $
+**  $Id: pcisupport.c,v 1.88 1999/01/26 04:54:38 peter Exp $
 **
 **  Device driver for DEC/INTEL PCI chipsets.
 **
@@ -43,7 +43,7 @@
 
 #include "opt_pci.h"
 #include "opt_smp.h"
-#include "intpm.h"
+/*#include "intpm.h"*/
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff --git a/sys/sys/module.h b/sys/sys/module.h
index efee3d127d38..3e0a000df37c 100644
--- a/sys/sys/module.h
+++ b/sys/sys/module.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: module.h,v 1.5 1998/11/14 21:58:41 wollman Exp $
+ *	$Id: module.h,v 1.6 1999/01/09 14:59:49 dfr Exp $
  */
 
 #ifndef _SYS_MODULE_H_
@@ -37,7 +37,7 @@ typedef enum modeventtype {
 
 typedef	struct module *module_t;
 
-typedef	int (*modeventhand_t)(module_t mod, int /*modeventtype_t*/ what,
+typedef	int (*modeventhand_t)(module_t mod, modeventtype_t what,
 			      void *arg);
 
 /*