From 372e6ef30943c8ec7269ec06938c9d79e90d37e3 Mon Sep 17 00:00:00 2001
From: dogcow <dogcow@NetBSD.org>
Date: Tue, 17 Oct 2006 18:21:29 +0000
Subject: [PATCH] now that we have -Wno-unused-parameter, back out all the
 tremendously ugly code to gratuitously access said parameters.

---
 sys/arch/i386/i386/vm_machdep.c      | 10 ++--------
 sys/dev/pci/pci_subr.c               |  8 ++------
 sys/dev/vnd.c                        |  6 ++----
 sys/dev/wscons/wsdisplay.c           |  6 ++----
 sys/dev/wscons/wskbd.c               |  6 ++----
 sys/dist/ipf/netinet/ip_fil_netbsd.c |  4 +---
 sys/dist/ipf/netinet/ip_nat.c        |  5 +----
 sys/dist/ipf/netinet/ip_state.c      |  7 ++-----
 sys/kern/kern_exec.c                 |  6 ++----
 sys/kern/kern_ktrace.c               |  6 ++----
 sys/kern/kern_ntptime.c              |  7 +++----
 sys/kern/kern_subr.c                 | 18 ++----------------
 sys/kern/sys_generic.c               | 12 ++----------
 sys/net/if_bridge.c                  |  6 ++----
 sys/netinet/tcp_subr.c               | 11 ++---------
 sys/nfs/nfs_nqlease.c                |  6 ++----
 sys/nfs/nfs_subs.c                   | 12 ++----------
 17 files changed, 33 insertions(+), 103 deletions(-)

diff --git a/sys/arch/i386/i386/vm_machdep.c b/sys/arch/i386/i386/vm_machdep.c
index 3044a8b1e65f..70363c7f7372 100644
--- a/sys/arch/i386/i386/vm_machdep.c
+++ b/sys/arch/i386/i386/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vm_machdep.c,v 1.125 2006/10/13 16:53:35 dogcow Exp $	*/
+/*	$NetBSD: vm_machdep.c,v 1.126 2006/10/17 18:21:29 dogcow Exp $	*/
 
 /*-
  * Copyright (c) 1982, 1986 The Regents of the University of California.
@@ -80,7 +80,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.125 2006/10/13 16:53:35 dogcow Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.126 2006/10/17 18:21:29 dogcow Exp $");
 
 #include "opt_user_ldt.h"
 #include "opt_largepages.h"
@@ -225,8 +225,6 @@ cpu_swapin(struct lwp *l)
 {
 #ifndef NOREDZONE
 	setredzone(l);
-#else
-	do { if (&l) {} } while (/* CONSTCOND */ 0); /* shut up -Wunused */
 #endif
 }
 
@@ -239,8 +237,6 @@ cpu_swapout(struct lwp *l)
 	 * Make sure we save the FP state before the user area vanishes.
 	 */
 	npxsave_lwp(l, 1);
-#else
-	do { if (&l) {} } while (/* CONSTCOND */ 0); /* shut up -Wunused */
 #endif
 }
 
@@ -262,8 +258,6 @@ cpu_lwp_free(struct lwp *l, int proc)
 #ifdef MTRR
 	if (proc && l->l_proc->p_md.md_flags & MDP_USEDMTRR)
 		mtrr_clean(l->l_proc);
-#else
-	do { if (&proc) {} } while (/* CONSTCOND */ 0); /* shut up -Wunused */
 #endif
 
 	/* Nuke the TSS. */
diff --git a/sys/dev/pci/pci_subr.c b/sys/dev/pci/pci_subr.c
index 9e44c83b025d..0efa789f96a5 100644
--- a/sys/dev/pci/pci_subr.c
+++ b/sys/dev/pci/pci_subr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci_subr.c,v 1.68 2006/10/13 20:53:59 christos Exp $	*/
+/*	$NetBSD: pci_subr.c,v 1.69 2006/10/17 18:21:29 dogcow Exp $	*/
 
 /*
  * Copyright (c) 1997 Zubin D. Dittia.  All rights reserved.
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.68 2006/10/13 20:53:59 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.69 2006/10/17 18:21:29 dogcow Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_pci.h"
@@ -321,8 +321,6 @@ pci_findvendor(pcireg_t id_reg __unused)
 	for (n = 0; n < pci_nvendors; n++)
 		if (pci_vendors[n].vendor == vendor)
 			return (pci_vendors[n].vendorname);
-#else
-	do { if (&id_reg) {} } while (/* CONSTCOND */ 0);
 #endif
 	return (NULL);
 }
@@ -339,8 +337,6 @@ pci_findproduct(pcireg_t id_reg __unused)
 		if (pci_products[n].vendor == vendor &&
 		    pci_products[n].product == product)
 			return (pci_products[n].productname);
-#else
-	do { if (&id_reg) {} } while (/* CONSTCOND */ 0);
 #endif
 	return (NULL);
 }
diff --git a/sys/dev/vnd.c b/sys/dev/vnd.c
index 837e8512d447..ee2ab9fdd0f6 100644
--- a/sys/dev/vnd.c
+++ b/sys/dev/vnd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vnd.c,v 1.155 2006/10/14 01:49:20 dogcow Exp $	*/
+/*	$NetBSD: vnd.c,v 1.156 2006/10/17 18:21:29 dogcow Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -133,7 +133,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.155 2006/10/14 01:49:20 dogcow Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.156 2006/10/17 18:21:29 dogcow Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "fs_nfs.h"
@@ -1347,8 +1347,6 @@ vndthrottle(struct vnd_softc *vnd, struct vnode *vp)
 	if (vp->v_op == nfsv2_vnodeop_p)
 		vnd->sc_maxactive = 2;
 	else
-#else
-	do { if (&vp) {} } while (/* CONSTCOND */ 0);
 #endif
 		vnd->sc_maxactive = 8;
 
diff --git a/sys/dev/wscons/wsdisplay.c b/sys/dev/wscons/wsdisplay.c
index 28ac99091849..28265218af70 100644
--- a/sys/dev/wscons/wsdisplay.c
+++ b/sys/dev/wscons/wsdisplay.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wsdisplay.c,v 1.103 2006/10/13 16:53:35 dogcow Exp $ */
+/* $NetBSD: wsdisplay.c,v 1.104 2006/10/17 18:21:29 dogcow Exp $ */
 
 /*
  * Copyright (c) 1996, 1997 Christopher G. Demetriou.  All rights reserved.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.103 2006/10/13 16:53:35 dogcow Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.104 2006/10/17 18:21:29 dogcow Exp $");
 
 #include "opt_wsdisplay_compat.h"
 #include "opt_wsmsgattrs.h"
@@ -839,8 +839,6 @@ wsdisplayclose(dev_t dev, int flag, int mode __unused, struct lwp *l)
 		(void)wsdisplay_internal_ioctl(sc, scr, WSKBDIO_SETMODE,
 					       (caddr_t)&kbmode, 0, l);
 	}
-#else
-	do { if (&l) {} } while (/* CONSTCOND */ 0); /* shut up -Wunused */
 #endif
 
 	scr->scr_flags &= ~SCR_OPEN;
diff --git a/sys/dev/wscons/wskbd.c b/sys/dev/wscons/wskbd.c
index 9321676fd110..478dff41168d 100644
--- a/sys/dev/wscons/wskbd.c
+++ b/sys/dev/wscons/wskbd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: wskbd.c,v 1.96 2006/10/13 16:53:35 dogcow Exp $ */
+/* $NetBSD: wskbd.c,v 1.97 2006/10/17 18:21:29 dogcow Exp $ */
 
 /*
  * Copyright (c) 1996, 1997 Christopher G. Demetriou.  All rights reserved.
@@ -79,7 +79,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.96 2006/10/13 16:53:35 dogcow Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wskbd.c,v 1.97 2006/10/17 18:21:29 dogcow Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -1233,8 +1233,6 @@ wskbd_set_console_display(struct device *displaydv, struct wsevsrc *me)
 	sc->sc_base.me_dispdv = displaydv;
 #if NWSMUX > 0
 	(void)wsmux_attach_sc((struct wsmux_softc *)me, &sc->sc_base);
-#else
-	do { if (&me) {} } while (/* CONSTCOND */ 0); /* shut up -Wunused */
 #endif
 	return (&sc->sc_base);
 }
diff --git a/sys/dist/ipf/netinet/ip_fil_netbsd.c b/sys/dist/ipf/netinet/ip_fil_netbsd.c
index 1771e246f603..76be16826ec0 100644
--- a/sys/dist/ipf/netinet/ip_fil_netbsd.c
+++ b/sys/dist/ipf/netinet/ip_fil_netbsd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_fil_netbsd.c,v 1.26 2006/10/13 16:53:36 dogcow Exp $	*/
+/*	$NetBSD: ip_fil_netbsd.c,v 1.27 2006/10/17 18:21:29 dogcow Exp $	*/
 
 /*
  * Copyright (C) 1993-2003 by Darren Reed.
@@ -794,8 +794,6 @@ int iplread(
 #ifdef IPFILTER_LOG
 	return ipflog_read(GET_MINOR(dev), uio);
 #else
-	do { if (&dev) {} } while (/* CONSTCOND */ 0); /* make -Wunused */
-	do { if (&uio) {} } while (/* CONSTCOND */ 0); /* not complain */
 	return ENXIO;
 #endif
 }
diff --git a/sys/dist/ipf/netinet/ip_nat.c b/sys/dist/ipf/netinet/ip_nat.c
index 873660159476..46c1c34e42db 100644
--- a/sys/dist/ipf/netinet/ip_nat.c
+++ b/sys/dist/ipf/netinet/ip_nat.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_nat.c,v 1.17 2006/10/13 16:53:36 dogcow Exp $	*/
+/*	$NetBSD: ip_nat.c,v 1.18 2006/10/17 18:21:29 dogcow Exp $	*/
 
 /*
  * Copyright (C) 1995-2003 by Darren Reed.
@@ -4579,9 +4579,6 @@ u_int type;
 	types[0] = 0;
 
 	(void) ipllog(IPL_LOGNAT, NULL, items, sizes, types, 1);
-#else /* shut up -Wunused */
-	do { if (&nat) {} } while (/* CONSTCOND */ 0);
-	do { if (&type) {} } while (/* CONSTCOND */ 0);
 #endif
 }
 
diff --git a/sys/dist/ipf/netinet/ip_state.c b/sys/dist/ipf/netinet/ip_state.c
index cab9261819c8..6ca0a006be51 100644
--- a/sys/dist/ipf/netinet/ip_state.c
+++ b/sys/dist/ipf/netinet/ip_state.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_state.c,v 1.13 2006/10/13 16:53:36 dogcow Exp $	*/
+/*	$NetBSD: ip_state.c,v 1.14 2006/10/17 18:21:29 dogcow Exp $	*/
 
 /*
  * Copyright (C) 1995-2003 by Darren Reed.
@@ -110,7 +110,7 @@ struct file;
 #if !defined(lint)
 #if defined(__NetBSD__)
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_state.c,v 1.13 2006/10/13 16:53:36 dogcow Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_state.c,v 1.14 2006/10/17 18:21:29 dogcow Exp $");
 #else
 static const char sccsid[] = "@(#)ip_state.c	1.8 6/5/96 (C) 1993-2000 Darren Reed";
 static const char rcsid[] = "@(#)Id: ip_state.c,v 2.186.2.41 2006/04/01 10:16:28 darrenr Exp";
@@ -3510,9 +3510,6 @@ u_int type;
 	} else {
 		ATOMIC_INCL(ips_stats.iss_logfail);
 	}
-#else /* shut up -Wunused */
-	do { if (&is) {} } while (/* CONSTCOND */ 0);
-	do { if (&type) {} } while (/* CONSTCOND */ 0);
 #endif
 }
 
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index 8008bafd2467..c19738892d7a 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_exec.c,v 1.229 2006/10/13 16:53:36 dogcow Exp $	*/
+/*	$NetBSD: kern_exec.c,v 1.230 2006/10/17 18:21:29 dogcow Exp $	*/
 
 /*-
  * Copyright (C) 1993, 1994, 1996 Christopher G. Demetriou
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.229 2006/10/13 16:53:36 dogcow Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.230 2006/10/17 18:21:29 dogcow Exp $");
 
 #include "opt_ktrace.h"
 #include "opt_syscall_debug.h"
@@ -1365,8 +1365,6 @@ exec_init(int init_boot)
 #ifdef DIAGNOSTIC
 	if (!init_boot)
 		panic("exec_init(): called with init_boot == 0");
-#else /* shut up -Wunused */
-	do { if (&init_boot) {} } while (/* CONSTCOND */ 0);
 #endif
 
 	/* do one-time initializations */
diff --git a/sys/kern/kern_ktrace.c b/sys/kern/kern_ktrace.c
index 39472ab2cccb..dd5d847e9dde 100644
--- a/sys/kern/kern_ktrace.c
+++ b/sys/kern/kern_ktrace.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_ktrace.c,v 1.108 2006/10/13 16:53:36 dogcow Exp $	*/
+/*	$NetBSD: kern_ktrace.c,v 1.109 2006/10/17 18:21:29 dogcow Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_ktrace.c,v 1.108 2006/10/13 16:53:36 dogcow Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_ktrace.c,v 1.109 2006/10/17 18:21:29 dogcow Exp $");
 
 #include "opt_ktrace.h"
 #include "opt_compat_mach.h"
@@ -1327,8 +1327,6 @@ sys_utrace(struct lwp *l, void *v, register_t *retval __unused)
 
 	return (0);
 #else /* !KTRACE */
-	do { if (&l) {} } while (/* CONSTCOND */ 0); /* quiet -Wunused */
-	do { if (&v) {} } while (/* CONSTCOND */ 0);
 	return ENOSYS;
 #endif /* KTRACE */
 }
diff --git a/sys/kern/kern_ntptime.c b/sys/kern/kern_ntptime.c
index 3bb4528b993b..724f4036cbed 100644
--- a/sys/kern/kern_ntptime.c
+++ b/sys/kern/kern_ntptime.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_ntptime.c,v 1.39 2006/10/13 16:53:36 dogcow Exp $	*/
+/*	$NetBSD: kern_ntptime.c,v 1.40 2006/10/17 18:21:29 dogcow Exp $	*/
 #include <sys/types.h> 	/* XXX to get __HAVE_TIMECOUNTER, remove
 			   after all ports are converted. */
 #ifdef __HAVE_TIMECOUNTER
@@ -37,7 +37,7 @@
 
 #include <sys/cdefs.h>
 /* __FBSDID("$FreeBSD: src/sys/kern/kern_ntptime.c,v 1.59 2005/05/28 14:34:41 rwatson Exp $"); */
-__KERNEL_RCSID(0, "$NetBSD: kern_ntptime.c,v 1.39 2006/10/13 16:53:36 dogcow Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_ntptime.c,v 1.40 2006/10/17 18:21:29 dogcow Exp $");
 
 #include "opt_ntp.h"
 #include "opt_compat_netbsd.h"
@@ -503,7 +503,6 @@ ntp_update_second(int64_t *adjustment, time_t *newsec)
 		time_status &= ~STA_PPSSIGNAL;
 #endif /* PPS_SYNC */
 #else  /* !NTP */
-	do { if (&newsec) {} } while (/* CONSTCOND */ 0); /* quiet -Wunused */
 	L_CLR(time_adj);
 #endif /* !NTP */
 
@@ -905,7 +904,7 @@ hardpps(struct timespec *tsp,		/* time at PPS */
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_ntptime.c,v 1.39 2006/10/13 16:53:36 dogcow Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_ntptime.c,v 1.40 2006/10/17 18:21:29 dogcow Exp $");
 
 #include "opt_ntp.h"
 #include "opt_compat_netbsd.h"
diff --git a/sys/kern/kern_subr.c b/sys/kern/kern_subr.c
index acd2d6590366..6f63d05ace1a 100644
--- a/sys/kern/kern_subr.c
+++ b/sys/kern/kern_subr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_subr.c,v 1.148 2006/10/13 16:53:36 dogcow Exp $	*/
+/*	$NetBSD: kern_subr.c,v 1.149 2006/10/17 18:21:29 dogcow Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998, 1999, 2002 The NetBSD Foundation, Inc.
@@ -86,7 +86,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_subr.c,v 1.148 2006/10/13 16:53:36 dogcow Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_subr.c,v 1.149 2006/10/17 18:21:29 dogcow Exp $");
 
 #include "opt_ddb.h"
 #include "opt_md.h"
@@ -1364,11 +1364,6 @@ trace_enter(struct lwp *l, register_t code,
 {
 	struct proc *p = l->l_proc;
 
-	do { if (&code) {} } while (/* CONSTCOND */ 0);
-	do { if (&realcode) {} } while (/* CONSTCOND */ 0);
-	do { if (&callp) {} } while (/* CONSTCOND */ 0);
-	do { if (&args) {} } while (/* CONSTCOND */ 0);
-	do { if (&p) {} } while (/* CONSTCOND */ 0);
 
 #if defined(SYSCALL_DEBUG) || defined(KTRACE) || defined(PTRACE) || defined(SYSTRACE)
 #ifdef SYSCALL_DEBUG
@@ -1405,10 +1400,6 @@ trace_exit(struct lwp *l, register_t code, void *args __unused,
     register_t rval[], int error)
 {
 	struct proc *p = l->l_proc;
-	do { if (&code) {} } while (/* CONSTCOND */ 0);
-	do { if (&rval) {} } while (/* CONSTCOND */ 0);
-	do { if (&error) {} } while (/* CONSTCOND */ 0);
-	do { if (&p) {} } while (/* CONSTCOND */ 0);
 
 #if defined(SYSCALL_DEBUG) || defined(KTRACE) || defined(PTRACE) || defined(SYSTRACE)
 #ifdef SYSCALL_DEBUG
@@ -1435,10 +1426,5 @@ trace_exit(struct lwp *l, register_t code, void *args __unused,
 		KERNEL_PROC_UNLOCK(l);
 	}
 #endif
-#else
-	do { if (&code) {} } while (/* CONSTCOND */ 0);
-	do { if (&realcode) {} } while (/* CONSTCOND */ 0);
-	do { if (&callp) {} } while (/* CONSTCOND */ 0);
-	do { if (&args) {} } while (/* CONSTCOND */ 0);
 #endif /* SYSCALL_DEBUG || {K,P,SYS}TRACE */
 }
diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c
index 2fb154db09a8..f909519dfdb5 100644
--- a/sys/kern/sys_generic.c
+++ b/sys/kern/sys_generic.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sys_generic.c,v 1.94 2006/10/13 16:53:36 dogcow Exp $	*/
+/*	$NetBSD: sys_generic.c,v 1.95 2006/10/17 18:21:29 dogcow Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_generic.c,v 1.94 2006/10/13 16:53:36 dogcow Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_generic.c,v 1.95 2006/10/17 18:21:29 dogcow Exp $");
 
 #include "opt_ktrace.h"
 
@@ -116,8 +116,6 @@ dofileread(struct lwp *l, int fd, struct file *fp, void *buf, size_t nbyte,
 	int error;
 #ifdef KTRACE
 	struct iovec	ktriov = { .iov_base = NULL, };
-#else
-	do { if (&fd) {} } while (/* CONSTCOND */ 0); /* shut up -Wunused */
 #endif
 	p = l->l_proc;
 
@@ -217,8 +215,6 @@ dofilereadv(struct lwp *l, int fd, struct file *fp, const struct iovec *iovp,
 	u_int		iovlen;
 #ifdef KTRACE
 	struct iovec	*ktriov;
-#else
-	do { if (&fd) {} } while (/* CONSTCOND */ 0); /* shut up -Wunused */
 #endif
 
 	p = l->l_proc;
@@ -348,8 +344,6 @@ dofilewrite(struct lwp *l, int fd, struct file *fp, const void *buf,
 	int error;
 #ifdef KTRACE
 	struct iovec	ktriov = { .iov_base = NULL, };
-#else
-	do { if (&fd) {} } while (/* CONSTCOND */ 0); /* shut up -Wunused */
 #endif
 
 	p = l->l_proc;
@@ -451,8 +445,6 @@ dofilewritev(struct lwp *l, int fd, struct file *fp, const struct iovec *iovp,
 	u_int		iovlen;
 #ifdef KTRACE
 	struct iovec	*ktriov;
-#else
-	do { if (&fd) {} } while (/* CONSTCOND */ 0); /* shut up -Wunused */
 #endif
 
 	p = l->l_proc;
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c
index de74bbce3d67..8a9f3961b94a 100644
--- a/sys/net/if_bridge.c
+++ b/sys/net/if_bridge.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_bridge.c,v 1.43 2006/10/13 16:53:36 dogcow Exp $	*/
+/*	$NetBSD: if_bridge.c,v 1.44 2006/10/17 18:21:29 dogcow Exp $	*/
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -80,7 +80,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.43 2006/10/13 16:53:36 dogcow Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.44 2006/10/17 18:21:29 dogcow Exp $");
 
 #include "opt_bridge_ipf.h"
 #include "opt_inet.h"
@@ -1164,8 +1164,6 @@ bridge_enqueue(struct bridge_softc *sc, struct ifnet *dst_ifp, struct mbuf *m,
 		if (m == NULL)
 			return;
 	}
-#else
-	do { if (&runfilt) {} } while (/* CONSTCOND */ 0); /* quiet -Wunused */
 #endif /* PFIL_HOOKS */
 
 #ifdef ALTQ
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
index 9af57b6306db..98d04cd0bb01 100644
--- a/sys/netinet/tcp_subr.c
+++ b/sys/netinet/tcp_subr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: tcp_subr.c,v 1.205 2006/10/13 18:28:06 dogcow Exp $	*/
+/*	$NetBSD: tcp_subr.c,v 1.206 2006/10/17 18:21:29 dogcow Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -98,7 +98,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_subr.c,v 1.205 2006/10/13 18:28:06 dogcow Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_subr.c,v 1.206 2006/10/17 18:21:29 dogcow Exp $");
 
 #include "opt_inet.h"
 #include "opt_ipsec.h"
@@ -2166,13 +2166,6 @@ tcp_new_iss1(void *laddr, void *faddr, u_int16_t lport, u_int16_t fport,
 		printf("new ISS 0x%08x\n", tcp_iss);
 #endif
 	} else
-#else
-		 /* for -Wunused */
-		do { if (&laddr) {} } while (/* CONSTCOND */ 0);
-		do { if (&faddr) {} } while (/* CONSTCOND */ 0);
-		do { if (&lport) {} } while (/* CONSTCOND */ 0);
-		do { if (&fport) {} } while (/* CONSTCOND */ 0);
-		do { if (&addrsz) {} } while (/* CONSTCOND */ 0);
 #endif /* NRND > 0 */
 	{
 		/*
diff --git a/sys/nfs/nfs_nqlease.c b/sys/nfs/nfs_nqlease.c
index a66f147c421c..0532550570ef 100644
--- a/sys/nfs/nfs_nqlease.c
+++ b/sys/nfs/nfs_nqlease.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_nqlease.c,v 1.72 2006/10/13 20:53:59 christos Exp $	*/
+/*	$NetBSD: nfs_nqlease.c,v 1.73 2006/10/17 18:21:29 dogcow Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -49,7 +49,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_nqlease.c,v 1.72 2006/10/13 20:53:59 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_nqlease.c,v 1.73 2006/10/17 18:21:29 dogcow Exp $");
 
 #include "fs_nfs.h"
 #include "opt_nfs.h"
@@ -1138,8 +1138,6 @@ nqnfs_clientd(
 			np = CIRCLEQ_FIRST(&nmp->nm_timerhead);
 		}
 	    }
-#else
-	    do { if (&cred) {} } while (/* CONSTCOND */ 0); /* for -Wunused */
 #endif /* !NFS_V2_ONLY */
 
 	    /*
diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c
index 196bdc7d16b4..2614214654d7 100644
--- a/sys/nfs/nfs_subs.c
+++ b/sys/nfs/nfs_subs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_subs.c,v 1.174 2006/10/14 09:18:57 yamt Exp $	*/
+/*	$NetBSD: nfs_subs.c,v 1.175 2006/10/17 18:21:29 dogcow Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -70,7 +70,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_subs.c,v 1.174 2006/10/14 09:18:57 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_subs.c,v 1.175 2006/10/17 18:21:29 dogcow Exp $");
 
 #include "fs_nfs.h"
 #include "opt_nfs.h"
@@ -602,9 +602,6 @@ nfsm_reqh(
 	struct nfsmount *nmp;
 	u_int32_t *tl;
 	int nqflag;
-#else
-	do { if (&np) {} } while (/* CONSTCOND */ 0); /* for -Wunused */
-	do { if (&procid) {} } while (/* CONSTCOND */ 0); /* for -Wunused */
 #endif
 
 	mb = m_get(M_WAIT, MT_DATA);
@@ -2010,11 +2007,6 @@ nfs_check_wccdata(
 		}
 	}
 
-#else
-	do { if (&np) {} } while (/* CONSTCOND */ 0); /* for -Wunused */
-	do { if (&ctime) {} } while (/* CONSTCOND */ 0);
-	do { if (&mtime) {} } while (/* CONSTCOND */ 0);
-	do { if (&docheck) {} } while (/* CONSTCOND */ 0);
 #endif /* !defined(NFS_V2_ONLY) */
 
 	return error;