Consistently spell FALLTHROUGH to appease lint.

ok kettenis@ cloder@ tom@ henning@

33 files changed, 85 insertions, 85 deletions

diff --git a/sys/altq/altq_rmclass.h b/sys/altq/altq_rmclass.h
index bca3216833a..1c2e8daa090 100644
--- a/sys/altq/altq_rmclass.h
+++ b/sys/altq/altq_rmclass.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: altq_rmclass.h,v 1.8 2003/08/22 21:50:34 david Exp $	*/
+/*	$OpenBSD: altq_rmclass.h,v 1.9 2007/02/14 00:53:47 jsg Exp $	*/
 /*	$KAME: altq_rmclass.h,v 1.6 2000/12/09 09:22:44 kjc Exp $	*/
 
 /*
@@ -86,10 +86,10 @@ struct red;
 			/* if (xxs < 0) \
 				printf("rm_class: bogus time values\n"); */ \
 			delta = 0; \
-			/* fall through */ \
+			/* FALLTHROUGH */ \
 		case 2: \
 			delta += 1000000; \
-			/* fall through */ \
+			/* FALLTHROUGH */ \
 		case 1: \
 			delta += 1000000; \
 			break; \
diff --git a/sys/arch/alpha/alpha/db_disasm.c b/sys/arch/alpha/alpha/db_disasm.c
index 4f8f707a373..7119059361e 100644
--- a/sys/arch/alpha/alpha/db_disasm.c
+++ b/sys/arch/alpha/alpha/db_disasm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: db_disasm.c,v 1.18 2006/02/26 22:26:16 miod Exp $ */
+/* $OpenBSD: db_disasm.c,v 1.19 2007/02/14 00:53:47 jsg Exp $ */
 /* $NetBSD: db_disasm.c,v 1.8 2000/05/25 19:57:30 jhawk Exp $ */
 
 /* 
@@ -1021,7 +1021,7 @@ foperate:
 	case op_sts:
 	case op_stt:
 		fstore = TRUE;
-		/* fall through */
+		/* FALLTHROUGH */
 	case op_ldl:
 	case op_ldq:
 	case op_ldl_l:
diff --git a/sys/arch/i386/i386/linux_machdep.c b/sys/arch/i386/i386/linux_machdep.c
index 7169a3afab9..6e912cfec52 100644
--- a/sys/arch/i386/i386/linux_machdep.c
+++ b/sys/arch/i386/i386/linux_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: linux_machdep.c,v 1.33 2006/12/29 13:04:37 pedro Exp $	*/
+/*	$OpenBSD: linux_machdep.c,v 1.34 2007/02/14 00:53:47 jsg Exp $	*/
 /*	$NetBSD: linux_machdep.c,v 1.29 1996/05/03 19:42:11 christos Exp $	*/
 
 /*
@@ -455,7 +455,7 @@ linux_machdepioctl(struct proc *p, void *v, register_t *retval)
 	case LINUX_KIOCSOUND:
 		SCARG(&bia, data) =
 			(caddr_t)(((unsigned long)SCARG(&bia, data)) & 0xffff);
-		/* fall through */
+		/* FALLTHROUGH */
 	case LINUX_KDMKTONE:
 		com = KDMKTONE;
 		break;
diff --git a/sys/arch/vax/vax/db_disasm.c b/sys/arch/vax/vax/db_disasm.c
index 030ae1457ac..708d388dc83 100644
--- a/sys/arch/vax/vax/db_disasm.c
+++ b/sys/arch/vax/vax/db_disasm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_disasm.c,v 1.14 2006/01/11 22:49:52 miod Exp $ */
+/*	$OpenBSD: db_disasm.c,v 1.15 2007/02/14 00:53:47 jsg Exp $ */
 /*	$NetBSD: db_disasm.c,v 1.10 1998/04/13 12:10:27 ragge Exp $ */
 /*
  * Copyright (c) 2002, Miodrag Vallat.
@@ -345,7 +345,7 @@ get_operand(ib, size)
 			add_off(ib, tmp);
 			break;
 		}
-		/* fall through */
+		/* FALLTHROUGH */
 	case 8:		/* autoincrement */
 		if (reg == 0x0F) {	/* pc: immediate ==> special syntax */
 			switch (size) {
diff --git a/sys/dev/ata/ata_wdc.c b/sys/dev/ata/ata_wdc.c
index 38d14e9fd40..a88f5b23406 100644
--- a/sys/dev/ata/ata_wdc.c
+++ b/sys/dev/ata/ata_wdc.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: ata_wdc.c,v 1.29 2006/10/04 00:52:55 krw Exp $	*/
+/*      $OpenBSD: ata_wdc.c,v 1.30 2007/02/14 00:53:47 jsg Exp $	*/
 /*	$NetBSD: ata_wdc.c,v 1.21 1999/08/09 09:43:11 bouyer Exp $	*/
 
 /*
@@ -559,7 +559,7 @@ again:
 			chp->wdc->irqack(chp);
 		if (chp->ch_status & (WDCS_ERR | WDCS_DWF))
 			goto error;
-	/* fall through */
+	/* FALLTHROUGH */
 
 	case PIOMODE:
 		/* Don't try to set modes if controller can't be adjusted */
@@ -584,7 +584,7 @@ again:
 			chp->wdc->irqack(chp);
 		if (chp->ch_status & (WDCS_ERR | WDCS_DWF))
 			goto error;
-	/* fall through */
+	/* FALLTHROUGH */
 
 	case DMAMODE:
 		if (drvp->drive_flags & DRIVE_UDMA) {
@@ -606,7 +606,7 @@ again:
 			chp->wdc->irqack(chp);
 		if (chp->ch_status & (WDCS_ERR | WDCS_DWF))
 			goto error;
-	/* fall through */
+	/* FALLTHROUGH */
 
 	case GEOMETRY:
 	geometry:
@@ -628,7 +628,7 @@ again:
 			chp->wdc->irqack(chp);
 		if (chp->ch_status & (WDCS_ERR | WDCS_DWF))
 			goto error;
-		/* fall through */
+		/* FALLTHROUGH */
 
 	case MULTIMODE:
 	multimode:
@@ -647,7 +647,7 @@ again:
 			chp->wdc->irqack(chp);
 		if (chp->ch_status & (WDCS_ERR | WDCS_DWF))
 			goto error;
-		/* fall through */
+		/* FALLTHROUGH */
 
 	case READY:
 	ready:
diff --git a/sys/dev/atapiscsi/atapiscsi.c b/sys/dev/atapiscsi/atapiscsi.c
index a93222ca4b6..cfd0c2084ad 100644
--- a/sys/dev/atapiscsi/atapiscsi.c
+++ b/sys/dev/atapiscsi/atapiscsi.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: atapiscsi.c,v 1.76 2006/11/28 23:59:45 dlg Exp $     */
+/*      $OpenBSD: atapiscsi.c,v 1.77 2007/02/14 00:53:47 jsg Exp $     */
 
 /*
  * This code is derived from code with the copyright below.
@@ -1429,7 +1429,7 @@ wdc_atapi_ctrl(chp, xfer, timeout, ret)
 		break;
 
 	case ATAPI_DEVICE_RESET_WAIT_STATE:
-		/* fall through */
+		/* FALLTHROUGH */
 
 	case ATAPI_IDENTIFY_STATE:
 		wdccommandshort(chp, drvp->drive, ATAPI_IDENTIFY_DEVICE);
@@ -1482,7 +1482,7 @@ wdc_atapi_ctrl(chp, xfer, timeout, ret)
 			drvp->PIO_mode = 3;
 			chp->wdc->set_modes(chp);
 		}
-	/* fall through */
+	/* FALLTHROUGH */
 
 	case ATAPI_DMAMODE_STATE:
 		if (drvp->drive_flags & DRIVE_UDMA) {
@@ -1505,7 +1505,7 @@ wdc_atapi_ctrl(chp, xfer, timeout, ret)
 			chp->wdc->irqack(chp);
 		if (chp->ch_status & WDCS_ERR)
 			drvp->drive_flags &= ~(DRIVE_DMA | DRIVE_UDMA);
-	/* fall through */
+	/* FALLTHROUGH */
 
 	case ATAPI_READY_STATE:
 	ready:
diff --git a/sys/dev/ic/ar5210.c b/sys/dev/ic/ar5210.c
index 6da434be2fa..d6830c39bf8 100644
--- a/sys/dev/ic/ar5210.c
+++ b/sys/dev/ic/ar5210.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ar5210.c,v 1.33 2005/12/18 17:59:58 reyk Exp $        */
+/*     $OpenBSD: ar5210.c,v 1.34 2007/02/14 00:53:48 jsg Exp $        */
 
 /*
  * Copyright (c) 2004, 2005 Reyk Floeter <reyk@openbsd.org>
@@ -1869,7 +1869,7 @@ ar5k_ar5210_set_power(struct ath_hal *hal, HAL_POWER_MODE mode,
 	switch (mode) {
 	case HAL_PM_AUTO:
 		staid &= ~AR5K_AR5210_STA_ID1_DEFAULT_ANTENNA;
-		/* fallthrough */
+		/* FALLTHROUGH */
 	case HAL_PM_NETWORK_SLEEP:
 		if (set_chip == AH_TRUE) {
 			AR5K_REG_WRITE(AR5K_AR5210_SCR,
diff --git a/sys/dev/ic/ar5211.c b/sys/dev/ic/ar5211.c
index bbbb593270f..34fa1e7fdf5 100644
--- a/sys/dev/ic/ar5211.c
+++ b/sys/dev/ic/ar5211.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar5211.c,v 1.28 2006/09/19 16:42:29 reyk Exp $	*/
+/*	$OpenBSD: ar5211.c,v 1.29 2007/02/14 00:53:48 jsg Exp $	*/
 
 /*
  * Copyright (c) 2004, 2005 Reyk Floeter <reyk@openbsd.org>
@@ -1974,7 +1974,7 @@ ar5k_ar5211_set_power(struct ath_hal *hal, HAL_POWER_MODE mode,
 	switch (mode) {
 	case HAL_PM_AUTO:
 		staid &= ~AR5K_AR5211_STA_ID1_DEFAULT_ANTENNA;
-		/* fallthrough */
+		/* FALLTHROUGH */
 	case HAL_PM_NETWORK_SLEEP:
 		if (set_chip == AH_TRUE) {
 			AR5K_REG_WRITE(AR5K_AR5211_SCR,
diff --git a/sys/dev/ic/ar5212.c b/sys/dev/ic/ar5212.c
index 2aa525dcb0c..5152ba3e220 100644
--- a/sys/dev/ic/ar5212.c
+++ b/sys/dev/ic/ar5212.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar5212.c,v 1.34 2006/12/14 09:23:24 reyk Exp $	*/
+/*	$OpenBSD: ar5212.c,v 1.35 2007/02/14 00:53:48 jsg Exp $	*/
 
 /*
  * Copyright (c) 2004, 2005 Reyk Floeter <reyk@openbsd.org>
@@ -2306,7 +2306,7 @@ ar5k_ar5212_set_power(struct ath_hal *hal, HAL_POWER_MODE mode,
 	switch (mode) {
 	case HAL_PM_AUTO:
 		staid &= ~AR5K_AR5212_STA_ID1_DEFAULT_ANTENNA;
-		/* fallthrough */
+		/* FALLTHROUGH */
 	case HAL_PM_NETWORK_SLEEP:
 		if (set_chip == AH_TRUE) {
 			AR5K_REG_WRITE(AR5K_AR5212_SCR,
diff --git a/sys/dev/ic/isp_target.c b/sys/dev/ic/isp_target.c
index 9e0b09f50d4..24c0e1c6035 100644
--- a/sys/dev/ic/isp_target.c
+++ b/sys/dev/ic/isp_target.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: isp_target.c,v 1.13 2003/10/21 18:58:49 jmc Exp $ */
+/* $OpenBSD: isp_target.c,v 1.14 2007/02/14 00:53:48 jsg Exp $ */
 /*
  * Machine and OS Independent Target Mode Code for the Qlogic SCSI/FC adapters.
  *
@@ -1047,7 +1047,7 @@ isp_handle_ctio2(struct ispsoftc *isp, ct2_entry_t *ct)
 	switch(ct->ct_status & ~QLTM_SVALID) {
 	case CT_BUS_ERROR:
 		isp_prt(isp, ISP_LOGERR, "PCI DMA Bus Error");
-		/* FALL Through */
+		/* FALLTHROUGH */
 	case CT_DATA_OVER:
 	case CT_DATA_UNDER:
 	case CT_OK:
diff --git a/sys/dev/ic/pdq.c b/sys/dev/ic/pdq.c
index 7cf5beaf8da..2a67671be96 100644
--- a/sys/dev/ic/pdq.c
+++ b/sys/dev/ic/pdq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pdq.c,v 1.12 2002/06/02 22:49:59 deraadt Exp $	*/
+/*	$OpenBSD: pdq.c,v 1.13 2007/02/14 00:53:48 jsg Exp $	*/
 /*	$NetBSD: pdq.c,v 1.9 1996/10/13 01:37:26 christos Exp $	*/
 
 /*-
@@ -999,7 +999,7 @@ pdq_stop(
 	    pdq_do_port_control(csrs, PDQ_PCTL_SUB_CMD);
 	    state = PDQ_PSTS_ADAPTER_STATE(PDQ_CSR_READ(csrs, csr_port_status));
 	    PDQ_ASSERT(state == PDQS_DMA_AVAILABLE);
-	    /* FALL THROUGH */
+	    /* FALLTHROUGH */
 	}
 	case PDQS_DMA_AVAILABLE: {
 	    PDQ_CSR_WRITE(csrs, csr_port_data_a, 0);
@@ -1007,7 +1007,7 @@ pdq_stop(
 	    pdq_do_port_control(csrs, PDQ_PCTL_DMA_UNINIT);
 	    state = PDQ_PSTS_ADAPTER_STATE(PDQ_CSR_READ(csrs, csr_port_status));
 	    PDQ_ASSERT(state == PDQS_DMA_UNAVAILABLE);
-	    /* FALL THROUGH */
+	    /* FALLTHROUGH */
 	}
 	case PDQS_DMA_UNAVAILABLE: {
 	    break;
diff --git a/sys/dev/isa/fd.c b/sys/dev/isa/fd.c
index eaaf04a3ceb..89722be6b6e 100644
--- a/sys/dev/isa/fd.c
+++ b/sys/dev/isa/fd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fd.c,v 1.58 2006/12/21 02:28:47 krw Exp $	*/
+/*	$OpenBSD: fd.c,v 1.59 2007/02/14 00:53:48 jsg Exp $	*/
 /*	$NetBSD: fd.c,v 1.90 1996/05/12 23:12:03 mycroft Exp $	*/
 
 /*-
@@ -669,7 +669,7 @@ loop:
 		/* Make sure the right drive is selected. */
 		fd_set_motor(fdc, 0);
 
-		/* fall through */
+		/* FALLTHROUGH */
 	case DOSEEK:
 	doseek:
 		if (fd->sc_cylin == bp->b_cylinder)
@@ -842,7 +842,7 @@ loop:
 			(void) fdcresult(fdc);
 		}
 
-		/* fall through */
+		/* FALLTHROUGH */
 	case DORECAL:
 		out_fdc(iot, ioh, NE7CMD_RECAL);	/* recal function */
 		out_fdc(iot, ioh, fd->sc_drive);
diff --git a/sys/dev/pci/if_de.c b/sys/dev/pci/if_de.c
index 3973edf19a4..bc9d0657b66 100644
--- a/sys/dev/pci/if_de.c
+++ b/sys/dev/pci/if_de.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_de.c,v 1.96 2006/07/08 04:15:36 brad Exp $	*/
+/*	$OpenBSD: if_de.c,v 1.97 2007/02/14 00:53:48 jsg Exp $	*/
 /*	$NetBSD: if_de.c,v 1.58 1998/01/12 09:39:58 thorpej Exp $	*/
 
 /*-
@@ -1292,7 +1292,7 @@ tulip_mii_autonegotiate(tulip_softc_t * const sc, const unsigned phyaddr)
 	    sc->tulip_probe_timeout = 3000;
 	    sc->tulip_intrmask |= TULIP_STS_ABNRMLINTR|TULIP_STS_NORMALINTR;
 	    sc->tulip_probe_state = TULIP_PROBE_PHYRESET;
-	    /* FALL THROUGH */
+	    /* FALLTHROUGH */
 	}
         case TULIP_PROBE_PHYRESET: {
 	    u_int32_t status;
@@ -1338,7 +1338,7 @@ tulip_mii_autonegotiate(tulip_softc_t * const sc, const unsigned phyaddr)
 #endif
 	    sc->tulip_probe_state = TULIP_PROBE_PHYAUTONEG;
 	    sc->tulip_probe_timeout = 3000;
-	    /* FALL THROUGH */
+	    /* FALLTHROUGH */
 	}
         case TULIP_PROBE_PHYAUTONEG: {
 	    u_int32_t status = tulip_mii_readreg(sc, phyaddr, PHYREG_STATUS)
diff --git a/sys/dev/wscons/wsdisplay.c b/sys/dev/wscons/wsdisplay.c
index d3a17233f2d..89b2ff521fb 100644
--- a/sys/dev/wscons/wsdisplay.c
+++ b/sys/dev/wscons/wsdisplay.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wsdisplay.c,v 1.75 2007/01/07 13:28:04 miod Exp $ */
+/* $OpenBSD: wsdisplay.c,v 1.76 2007/02/14 00:53:48 jsg Exp $ */
 /* $NetBSD: wsdisplay.c,v 1.82 2005/02/27 00:27:52 perry Exp $ */
 
 /*
@@ -1304,7 +1304,7 @@ wsdisplay_cfg_ioctl(struct wsdisplay_softc *sc, u_long cmd, caddr_t data,
 		if (d->idx == -1 && d->type == WSMUX_KBD)
 			d->idx = wskbd_pickfree();
 #undef d
-		/* fall into */
+		/* FALLTHROUGH */
 	case WSMUXIO_INJECTEVENT:
 	case WSMUXIO_REMOVE_DEVICE:
 	case WSMUXIO_LIST_DEVICES:
diff --git a/sys/isofs/cd9660/cd9660_rrip.c b/sys/isofs/cd9660/cd9660_rrip.c
index bbbb3670561..ef4d61026a6 100644
--- a/sys/isofs/cd9660/cd9660_rrip.c
+++ b/sys/isofs/cd9660/cd9660_rrip.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd9660_rrip.c,v 1.8 2003/06/02 23:28:05 millert Exp $	*/
+/*	$OpenBSD: cd9660_rrip.c,v 1.9 2007/02/14 00:53:48 jsg Exp $	*/
 /*	$NetBSD: cd9660_rrip.c,v 1.17 1997/01/24 00:27:32 cgd Exp $	*/
 
 /*-
@@ -184,7 +184,7 @@ cd9660_rrip_slink(v, ana)
 			
 		case ISO_SUSP_CFLAG_CONTINUE:
 			cont = 1;
-			/* fall thru */
+			/* FALLTHROUGH */
 		case 0:
 			/* Inserting component */
 			wlen = isonum_711(pcomp->clen);
@@ -256,7 +256,7 @@ cd9660_rrip_altname(v, ana)
 		
 	case ISO_SUSP_CFLAG_CONTINUE:
 		cont = 1;
-		/* fall thru */
+		/* FALLTHROUGH */
 	case 0:
 		/* Inserting component */
 		wlen = isonum_711(p->h.length) - 5;
diff --git a/sys/kern/kern_lock.c b/sys/kern/kern_lock.c
index f52906b2d01..1701c0ce7f2 100644
--- a/sys/kern/kern_lock.c
+++ b/sys/kern/kern_lock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_lock.c,v 1.23 2007/02/03 16:48:23 miod Exp $	*/
+/*	$OpenBSD: kern_lock.c,v 1.24 2007/02/14 00:53:48 jsg Exp $	*/
 
 /* 
  * Copyright (c) 1995
@@ -308,7 +308,7 @@ lockmgr(__volatile struct lock *lkp, u_int flags, struct simplelock *interlkp)
 		 */
 		lkp->lk_sharecount++;
 		COUNT(lkp, p, cpu_id, 1);
-		/* fall into downgrade */
+		/* FALLTHROUGH */
 
 	case LK_DOWNGRADE:
 		if (WEHOLDIT(lkp, pid, cpu_id) == 0 ||
@@ -379,7 +379,7 @@ lockmgr(__volatile struct lock *lkp, u_int flags, struct simplelock *interlkp)
 		 */
 		if (lkp->lk_sharecount == 0)
 			WAKEUP_WAITER(lkp);
-		/* fall into exclusive request */
+		/* FALLTHROUGH */
 
 	case LK_EXCLUSIVE:
 		if (WEHOLDIT(lkp, pid, cpu_id)) {
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index 4c63f749fba..093298d5a70 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uipc_socket.c,v 1.64 2006/06/10 17:05:17 beck Exp $	*/
+/*	$OpenBSD: uipc_socket.c,v 1.65 2007/02/14 00:53:48 jsg Exp $	*/
 /*	$NetBSD: uipc_socket.c,v 1.21 1996/02/04 02:17:52 christos Exp $	*/
 
 /*
@@ -989,7 +989,7 @@ sosetopt(struct socket *so, int level, int optname, struct mbuf *m0)
 				goto bad;
 			}
 			so->so_linger = mtod(m, struct linger *)->l_linger;
-			/* fall thru... */
+			/* FALLTHROUGH */
 
 		case SO_DEBUG:
 		case SO_KEEPALIVE:
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index 0e578357804..7a2642d39f0 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vfs_subr.c,v 1.136 2007/02/13 17:04:14 mickey Exp $	*/
+/*	$OpenBSD: vfs_subr.c,v 1.137 2007/02/14 00:53:48 jsg Exp $	*/
 /*	$NetBSD: vfs_subr.c,v 1.53 1996/04/22 01:39:13 christos Exp $	*/
 
 /*
@@ -2178,7 +2178,7 @@ reassignbuf(struct buf *bp)
 					delay = syncdelay / 3;
 					break;
 				}
-				/* fall through */
+				/* FALLTHROUGH */
 			default:
 				delay = syncdelay;
 			}
diff --git a/sys/net/bridgestp.c b/sys/net/bridgestp.c
index 7436351ca05..f916afb4707 100644
--- a/sys/net/bridgestp.c
+++ b/sys/net/bridgestp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bridgestp.c,v 1.24 2006/12/11 22:11:48 reyk Exp $	*/
+/*	$OpenBSD: bridgestp.c,v 1.25 2007/02/14 00:53:48 jsg Exp $	*/
 
 /*
  * Copyright (c) 2000 Jason L. Wright (jason@thought.net)
@@ -1500,7 +1500,7 @@ bstp_set_port_tc(struct bstp_port *bp, int state)
 	case BSTP_TCSTATE_TCN:
 		bstp_set_timer_tc(bp);
 		DPRINTF("%s -> TC_TCN\n", bp->bp_ifp->if_xname);
-		/* FALLTROUGH */
+		/* FALLTHROUGH */
 	case BSTP_TCSTATE_TC:
 		bp->bp_rcvdtc = 0;
 		bp->bp_rcvdtcn = 0;
diff --git a/sys/net/if.c b/sys/net/if.c
index fa1ca942f17..165f044713a 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if.c,v 1.154 2007/02/12 22:36:47 mpf Exp $	*/
+/*	$OpenBSD: if.c,v 1.155 2007/02/14 00:53:48 jsg Exp $	*/
 /*	$NetBSD: if.c,v 1.35 1996/05/07 05:26:04 thorpej Exp $	*/
 
 /*
@@ -1336,7 +1336,7 @@ ifioctl(struct socket *so, u_long cmd, caddr_t data, struct proc *p)
 	                bcopy((caddr_t)ifr->ifr_addr.sa_data,
 			      (caddr_t)((struct arpcom *)ifp)->ac_enaddr,
 			      ETHER_ADDR_LEN);
-			/* fall through */
+			/* FALLTHROUGH */
 		case IFT_ARCNET:
                         bcopy((caddr_t)ifr->ifr_addr.sa_data,
 			      LLADDR(sdl), ETHER_ADDR_LEN);
diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c
index e73d1d5a028..cc8f2d316f5 100644
--- a/sys/net/if_spppsubr.c
+++ b/sys/net/if_spppsubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_spppsubr.c,v 1.45 2007/02/11 20:29:22 miod Exp $	*/
+/*	$OpenBSD: if_spppsubr.c,v 1.46 2007/02/14 00:53:48 jsg Exp $	*/
 /*
  * Synchronous PPP/Cisco link level subroutines.
  * Keepalive protocol implemented in both Cisco and PPP modes.
@@ -973,7 +973,7 @@ sppp_ioctl(struct ifnet *ifp, u_long cmd, void *data)
 
 	case SIOCSIFADDR:
 		if_up(ifp);
-		/* fall through... */
+		/* FALLTHROUGH */
 
 	case SIOCSIFFLAGS:
 		going_up = (ifp->if_flags & IFF_UP) &&
@@ -1438,7 +1438,7 @@ sppp_cp_input(const struct cp *cp, struct sppp *sp, struct mbuf *m)
 		case STATE_ACK_RCVD:
 		case STATE_ACK_SENT:
 			sppp_cp_change_state(cp, sp, STATE_REQ_SENT);
-			/* fall through */
+			/* FALLTHROUGH */
 		case STATE_CLOSED:
 		case STATE_STOPPED:
 		case STATE_CLOSING:
@@ -2042,7 +2042,7 @@ sppp_lcp_RCR(struct sppp *sp, struct lcp_header *h, int len)
 		switch (*p) {
 		case LCP_OPT_MAGIC:
 			/* Magic number. */
-			/* fall through, both are same length */
+			/* FALLTHROUGH, both are same length */
 		case LCP_OPT_ASYNC_MAP:
 			/* Async control character map. */
 			if (len >= 6 && p[1] == 6)
@@ -3321,7 +3321,7 @@ sppp_chap_TO(void *cookie)
 		case STATE_OPENED:
 			/* TO* event */
 			sp->rst_counter[IDX_CHAP] = sp->lcp.max_configure;
-			/* fall through */
+			/* FALLTHROUGH */
 		case STATE_REQ_SENT:
 			chap.scr(sp);
 			/* sppp_cp_change_state() will restart the timer */
diff --git a/sys/net/pf.c b/sys/net/pf.c
index 50ee55615cf..1674af2c81d 100644
--- a/sys/net/pf.c
+++ b/sys/net/pf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf.c,v 1.524 2007/02/08 15:24:24 itojun Exp $ */
+/*	$OpenBSD: pf.c,v 1.525 2007/02/14 00:53:48 jsg Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -6355,7 +6355,7 @@ pf_test6(int dir, struct ifnet *ifp, struct mbuf **m0,
 					ip6->ip6_dst = finaldst;
 				}
 			}
-			/* fallthrough */
+			/* FALLTHROUGH */
 		}
 		case IPPROTO_AH:
 		case IPPROTO_HOPOPTS:
diff --git a/sys/net/pfkeyv2.c b/sys/net/pfkeyv2.c
index 890e59d9591..20425502e29 100644
--- a/sys/net/pfkeyv2.c
+++ b/sys/net/pfkeyv2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pfkeyv2.c,v 1.113 2007/01/18 20:00:19 henning Exp $ */
+/* $OpenBSD: pfkeyv2.c,v 1.114 2007/02/14 00:53:48 jsg Exp $ */
 
 /*
  *	@(#)COPYRIGHT	1.1 (NRL) 17 January 1995
@@ -1374,7 +1374,7 @@ pfkeyv2_send(struct socket *socket, void *message, int len)
 					ipsec_delete_policy(ipo);
 			}
 			splx(s);
-			/* Fall through */
+			/* FALLTHROUGH */
 		case SADB_SATYPE_AH:
 		case SADB_SATYPE_ESP:
 		case SADB_X_SATYPE_IPIP:
diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c
index 86c62998028..563d40efe36 100644
--- a/sys/net/rtsock.c
+++ b/sys/net/rtsock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtsock.c,v 1.62 2006/06/16 17:45:37 henning Exp $	*/
+/*	$OpenBSD: rtsock.c,v 1.63 2007/02/14 00:53:48 jsg Exp $	*/
 /*	$NetBSD: rtsock.c,v 1.18 1996/03/29 00:32:10 cgd Exp $	*/
 
 /*
@@ -426,7 +426,7 @@ report:
 				    rtlabel_name2id(rtlabel);
 			}
 			if_group_routechange(dst, netmask);
-			/* fallthrough */
+			/* FALLTHROUGH */
 		case RTM_LOCK:
 			rt->rt_rmx.rmx_locks &= ~(rtm->rtm_inits);
 			rt->rt_rmx.rmx_locks |=
diff --git a/sys/net/slcompress.c b/sys/net/slcompress.c
index 724f09a6037..cfb79243c37 100644
--- a/sys/net/slcompress.c
+++ b/sys/net/slcompress.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: slcompress.c,v 1.8 2003/12/10 07:22:42 itojun Exp $	*/
+/*	$OpenBSD: slcompress.c,v 1.9 2007/02/14 00:53:48 jsg Exp $	*/
 /*	$NetBSD: slcompress.c,v 1.17 1997/05/17 21:12:10 christos Exp $	*/
 
 /*
@@ -341,7 +341,7 @@ sl_compress_tcp(m, ip, comp, compress_cid)
 		    ntohs(cs->cs_ip.ip_len) == hlen)
 			break;
 
-		/* (fall through) */
+		/* FALLTHROUGH */
 
 	case SPECIAL_I:
 	case SPECIAL_D:
diff --git a/sys/netinet/in.c b/sys/netinet/in.c
index ef465658c04..8d21e073a4b 100644
--- a/sys/netinet/in.c
+++ b/sys/netinet/in.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: in.c,v 1.45 2007/01/02 11:41:28 markus Exp $	*/
+/*	$OpenBSD: in.c,v 1.46 2007/02/14 00:53:48 jsg Exp $	*/
 /*	$NetBSD: in.c,v 1.26 1996/02/13 23:41:39 christos Exp $	*/
 
 /*
@@ -234,7 +234,7 @@ in_control(so, cmd, data, ifp)
 	case SIOCDLIFADDR:
 		if ((so->so_state & SS_PRIV) == 0)
 			return (EPERM);
-		/*fall through*/
+		/* FALLTHROUGH */
 	case SIOCGLIFADDR:
 		if (!ifp)
 			return EINVAL;
diff --git a/sys/netinet/ip_ah.c b/sys/netinet/ip_ah.c
index 85d8fd0c245..db6ae7b46ed 100644
--- a/sys/netinet/ip_ah.c
+++ b/sys/netinet/ip_ah.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_ah.c,v 1.88 2007/02/08 15:25:30 itojun Exp $ */
+/*	$OpenBSD: ip_ah.c,v 1.89 2007/02/14 00:53:48 jsg Exp $ */
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
  * Angelos D. Keromytis (kermit@csd.uch.gr) and
@@ -311,7 +311,7 @@ ah_massage_headers(struct mbuf **m0, int proto, int skip, int alg, int out)
 					    sizeof(struct in_addr),
 					    &(ip->ip_dst), sizeof(struct in_addr));
 
-				/* Fall through */
+				/* FALLTHROUGH */
 			default:
 				/* Sanity check for option length. */
 				if (ptr[off + 1] < 2) {
diff --git a/sys/netinet/ip_ipsp.c b/sys/netinet/ip_ipsp.c
index ea16bded493..20f62d7b073 100644
--- a/sys/netinet/ip_ipsp.c
+++ b/sys/netinet/ip_ipsp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_ipsp.c,v 1.167 2007/01/18 20:00:19 henning Exp $	*/
+/*	$OpenBSD: ip_ipsp.c,v 1.168 2007/02/14 00:53:48 jsg Exp $	*/
 /*
  * The authors of this code are John Ioannidis (ji@tla.org),
  * Angelos D. Keromytis (kermit@csd.uch.gr),
@@ -1256,7 +1256,7 @@ ipsp_parse_headers(struct mbuf *m, int off, u_int8_t proto)
 						return SLIST_FIRST(&tags);
 			}
 		}
-		/* Fall through. */
+		/* FALLTHROUGH */
 		case IPPROTO_AH:
 			mtag = m_tag_get(PACKET_TAG_IPSEC_IN_CRYPTO_DONE,
 			    sizeof(struct tdb_ident), M_NOWAIT);
diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c
index cb2334933b1..46257ef5f03 100644
--- a/sys/netinet/ip_mroute.c
+++ b/sys/netinet/ip_mroute.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip_mroute.c,v 1.45 2006/06/15 10:11:27 pascoe Exp $	*/
+/*	$OpenBSD: ip_mroute.c,v 1.46 2007/02/14 00:53:48 jsg Exp $	*/
 /*	$NetBSD: ip_mroute.c,v 1.85 2004/04/26 01:31:57 matt Exp $	*/
 
 /*
@@ -371,10 +371,10 @@ mfc_find(struct in_addr *o, struct in_addr *g)
 	switch (xxs) {							\
 	case 2:								\
 		delta += 1000000;					\
-		/* fall through */					\
+		/* FALLTHROUGH */					\
 	case 1:								\
 		delta += 1000000;					\
-		/* fall through */					\
+		/* FALLTHROUGH */					\
 	case 0:								\
 		break;							\
 	default:							\
diff --git a/sys/netinet/ip_spd.c b/sys/netinet/ip_spd.c
index 32e06a9ec95..75e609c8746 100644
--- a/sys/netinet/ip_spd.c
+++ b/sys/netinet/ip_spd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_spd.c,v 1.52 2006/06/16 16:49:40 henning Exp $ */
+/* $OpenBSD: ip_spd.c,v 1.53 2007/02/14 00:53:48 jsg Exp $ */
 /*
  * The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu)
  *
@@ -414,7 +414,7 @@ ipsp_spd_lookup(struct mbuf *m, int af, int hlen, int *error, int direction,
 				return NULL;
 			}
 
-			/* Fall through */
+			/* FALLTHROUGH */
 		case IPSP_IPSEC_DONTACQ:
 			*error = -EINVAL; /* Silently drop packet. */
 			return NULL;
@@ -424,7 +424,7 @@ ipsp_spd_lookup(struct mbuf *m, int af, int hlen, int *error, int direction,
 			ipsp_acquire_sa(ipo, dignore ? &sdst : &ipo->ipo_dst,
 			    signore ? NULL : &ipo->ipo_src, ddst, NULL);
 
-			/* Fall through */
+			/* FALLTHROUGH */
 		case IPSP_IPSEC_USE:
 			*error = 0;
 			return ipsp_spd_inp(m, af, hlen, error, direction,
@@ -527,7 +527,7 @@ ipsp_spd_lookup(struct mbuf *m, int af, int hlen, int *error, int direction,
 			    signore ? NULL : &ipo->ipo_src, ddst, m)) != 0)
 				return NULL;
 
-			/* Fall through */
+			/* FALLTHROUGH */
 		case IPSP_IPSEC_DONTACQ:
 			/* Drop packet. */
 			*error = -EINVAL;
@@ -545,7 +545,7 @@ ipsp_spd_lookup(struct mbuf *m, int af, int hlen, int *error, int direction,
 			ipsp_acquire_sa(ipo, dignore ? &ssrc : &ipo->ipo_dst,
 			    signore ? NULL : &ipo->ipo_src, ddst, NULL);
 
-			/* Fall through */
+			/* FALLTHROUGH */
 		case IPSP_IPSEC_USE:
 			*error = 0;
 			return ipsp_spd_inp(m, af, hlen, error, direction,
diff --git a/sys/netinet6/raw_ip6.c b/sys/netinet6/raw_ip6.c
index fa3feb51918..5a861e6bdc9 100644
--- a/sys/netinet6/raw_ip6.c
+++ b/sys/netinet6/raw_ip6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: raw_ip6.c,v 1.31 2006/12/09 01:12:28 itojun Exp $	*/
+/*	$OpenBSD: raw_ip6.c,v 1.32 2007/02/14 00:53:48 jsg Exp $	*/
 /*	$KAME: raw_ip6.c,v 1.69 2001/03/04 15:55:44 itojun Exp $	*/
 
 /*
@@ -639,7 +639,7 @@ rip6_usrreq(so, req, m, nam, control, p)
 
 	case PRU_ABORT:
 		soisdisconnected(so);
-		/* Fallthrough */
+		/* FALLTHROUGH */
 	case PRU_DETACH:
 		if (in6p == 0)
 			panic("rip6_detach");
diff --git a/sys/ufs/ufs/ufs_quota.c b/sys/ufs/ufs/ufs_quota.c
index 460c3e6e2b9..876e31a727d 100644
--- a/sys/ufs/ufs/ufs_quota.c
+++ b/sys/ufs/ufs/ufs_quota.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ufs_quota.c,v 1.25 2006/06/25 15:01:54 sturm Exp $	*/
+/*	$OpenBSD: ufs_quota.c,v 1.26 2007/02/14 00:53:48 jsg Exp $	*/
 /*	$NetBSD: ufs_quota.c,v 1.8 1996/02/09 22:36:09 christos Exp $	*/
 
 /*
@@ -1018,7 +1018,7 @@ ufs_quotactl(struct mount *mp, int cmds, uid_t uid, caddr_t arg,
 	case Q_GETQUOTA:
 		if (uid == p->p_cred->p_ruid)
 			break;
-		/* fall through */
+		/* FALLTHROUGH */
 	default:
 		if ((error = suser(p, 0)) != 0)
 			return (error);
diff --git a/sys/uvm/uvm_meter.c b/sys/uvm/uvm_meter.c
index 143104c113d..85265e684de 100644
--- a/sys/uvm/uvm_meter.c
+++ b/sys/uvm/uvm_meter.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_meter.c,v 1.21 2006/11/29 12:24:18 miod Exp $	*/
+/*	$OpenBSD: uvm_meter.c,v 1.22 2007/02/14 00:53:48 jsg Exp $	*/
 /*	$NetBSD: uvm_meter.c,v 1.21 2001/07/14 06:36:03 matt Exp $	*/
 
 /*
@@ -107,7 +107,7 @@ uvm_loadav(avg)
 		case SSLEEP:
 			if (p->p_priority > PZERO || p->p_slptime > 1)
 				continue;
-		/* fall through */
+		/* FALLTHROUGH */
 		case SRUN:
 		case SIDL:
 		case SONPROC: