Module Name: src
Committed By: christos
Date: Sun Nov 10 18:27:15 UTC 2013
Modified Files:
src/sys/arch/emips/ebus: ace_ebus.c clock_ebus.c dz_ebus.c icap_ebus.c
if_le_ebus.c
src/sys/arch/emips/emips: machdep.c
src/sys/arch/mips/mips: mips_machdep.c pmap.c
Log Message:
fix unused variable warnings
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/emips/ebus/ace_ebus.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/emips/ebus/clock_ebus.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/emips/ebus/dz_ebus.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/emips/ebus/icap_ebus.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/emips/ebus/if_le_ebus.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/emips/emips/machdep.c
cvs rdiff -u -r1.257 -r1.258 src/sys/arch/mips/mips/mips_machdep.c
cvs rdiff -u -r1.208 -r1.209 src/sys/arch/mips/mips/pmap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/emips/ebus/ace_ebus.c
diff -u src/sys/arch/emips/ebus/ace_ebus.c:1.8 src/sys/arch/emips/ebus/ace_ebus.c:1.9
--- src/sys/arch/emips/ebus/ace_ebus.c:1.8 Sun Oct 13 02:55:34 2013
+++ src/sys/arch/emips/ebus/ace_ebus.c Sun Nov 10 13:27:15 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ace_ebus.c,v 1.8 2013/10/13 06:55:34 riz Exp $ */
+/* $NetBSD: ace_ebus.c,v 1.9 2013/11/10 18:27:15 christos Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ace_ebus.c,v 1.8 2013/10/13 06:55:34 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ace_ebus.c,v 1.9 2013/11/10 18:27:15 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1462,7 +1462,7 @@ sysace_send_config(struct ace_softc *sc,
* Rest of code lifted with mods from the dev\ata\wd.c driver
*/
-/* $NetBSD: ace_ebus.c,v 1.8 2013/10/13 06:55:34 riz Exp $ */
+/* $NetBSD: ace_ebus.c,v 1.9 2013/11/10 18:27:15 christos Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -2431,6 +2431,7 @@ acedump(dev_t dev, daddr_t blkno, void *
va, size, blkno);
DELAY(500 * 1000); /* half a second */
err = 0;
+ __USE(err);
#endif
acedoingadump = 0;
Index: src/sys/arch/emips/ebus/clock_ebus.c
diff -u src/sys/arch/emips/ebus/clock_ebus.c:1.6 src/sys/arch/emips/ebus/clock_ebus.c:1.7
--- src/sys/arch/emips/ebus/clock_ebus.c:1.6 Sun Jun 12 00:44:27 2011
+++ src/sys/arch/emips/ebus/clock_ebus.c Sun Nov 10 13:27:15 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: clock_ebus.c,v 1.6 2011/06/12 04:44:27 tsutsui Exp $ */
+/* $NetBSD: clock_ebus.c,v 1.7 2013/11/10 18:27:15 christos Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: clock_ebus.c,v 1.6 2011/06/12 04:44:27 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock_ebus.c,v 1.7 2013/11/10 18:27:15 christos Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -260,7 +260,7 @@ eclock_ebus_intr(void *cookie, void *f)
struct eclock_softc *sc = cookie;
struct _Tc *tc = sc->sc_dp;
struct clockframe *cf = f;
- volatile uint32_t x;
+ volatile uint32_t x __unused;
x = tc->Control;
tc->DownCounterHigh = 0;
Index: src/sys/arch/emips/ebus/dz_ebus.c
diff -u src/sys/arch/emips/ebus/dz_ebus.c:1.5 src/sys/arch/emips/ebus/dz_ebus.c:1.6
--- src/sys/arch/emips/ebus/dz_ebus.c:1.5 Sun Jun 12 01:22:30 2011
+++ src/sys/arch/emips/ebus/dz_ebus.c Sun Nov 10 13:27:15 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dz_ebus.c,v 1.5 2011/06/12 05:22:30 tsutsui Exp $ */
+/* $NetBSD: dz_ebus.c,v 1.6 2013/11/10 18:27:15 christos Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dz_ebus.c,v 1.5 2011/06/12 05:22:30 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dz_ebus.c,v 1.6 2013/11/10 18:27:15 christos Exp $");
#include "opt_ddb.h"
@@ -514,7 +514,7 @@ void
dzrint(struct dz_softc *sc, uint32_t csr)
{
struct tty *tp;
- int cc, mcc;
+ int cc;
struct _Usart *dzr;
sc->sc_rxint++;
@@ -523,11 +523,6 @@ dzrint(struct dz_softc *sc, uint32_t csr
cc = dzr->RxData;
tp = sc->sc_dz.dz_tty;
- if (csr & USI_RXBRK)
- mcc = CNC_BREAK;
- else
- mcc = cc;
-
/* clear errors before we print or bail out */
if (csr & (USI_OVRE|USI_FRAME|USI_PARE))
dzr->Control = USC_RSTSTA;
Index: src/sys/arch/emips/ebus/icap_ebus.c
diff -u src/sys/arch/emips/ebus/icap_ebus.c:1.3 src/sys/arch/emips/ebus/icap_ebus.c:1.4
--- src/sys/arch/emips/ebus/icap_ebus.c:1.3 Sat Oct 27 13:17:45 2012
+++ src/sys/arch/emips/ebus/icap_ebus.c Sun Nov 10 13:27:15 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: icap_ebus.c,v 1.3 2012/10/27 17:17:45 chs Exp $ */
+/* $NetBSD: icap_ebus.c,v 1.4 2013/11/10 18:27:15 christos Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: icap_ebus.c,v 1.3 2012/10/27 17:17:45 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icap_ebus.c,v 1.4 2013/11/10 18:27:15 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -387,6 +387,8 @@ icap_ebus_intr(void *cookie, void *f)
saf = sc->sc_dp->SizeAndFlags;
hi = sc->sc_dp->BufferAddressHi32; /* BUGBUG 64bit */
lo = sc->sc_dp->BufferAddressLo32; /* this pops the fifo */
+ __USE(hi);
+ __USE(lo);
/* Say its done that much (and sanity)
*/
Index: src/sys/arch/emips/ebus/if_le_ebus.c
diff -u src/sys/arch/emips/ebus/if_le_ebus.c:1.4 src/sys/arch/emips/ebus/if_le_ebus.c:1.5
--- src/sys/arch/emips/ebus/if_le_ebus.c:1.4 Thu Feb 2 14:42:59 2012
+++ src/sys/arch/emips/ebus/if_le_ebus.c Sun Nov 10 13:27:15 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le_ebus.c,v 1.4 2012/02/02 19:42:59 tls Exp $ */
+/* $NetBSD: if_le_ebus.c,v 1.5 2013/11/10 18:27:15 christos Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le_ebus.c,v 1.4 2012/02/02 19:42:59 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le_ebus.c,v 1.5 2013/11/10 18:27:15 christos Exp $");
#include "opt_inet.h"
@@ -683,6 +683,7 @@ enic_intr(void *cookie, void *f)
saf = sc->sc_regs->SizeAndFlags;
hi = sc->sc_regs->BufferAddressHi32; /* BUGBUG 64bit */
lo = sc->sc_regs->BufferAddressLo32; /* this pops the fifo */
+ __USE(hi);
fl = saf & (ES_F_MASK &~ ES_F_DONE);
if (fl == ES_F_RECV)
Index: src/sys/arch/emips/emips/machdep.c
diff -u src/sys/arch/emips/emips/machdep.c:1.8 src/sys/arch/emips/emips/machdep.c:1.9
--- src/sys/arch/emips/emips/machdep.c:1.8 Sat Oct 27 13:17:46 2012
+++ src/sys/arch/emips/emips/machdep.c Sun Nov 10 13:27:15 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.8 2012/10/27 17:17:46 chs Exp $ */
+/* $NetBSD: machdep.c,v 1.9 2013/11/10 18:27:15 christos Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.8 2012/10/27 17:17:46 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.9 2013/11/10 18:27:15 christos Exp $");
#include "opt_ddb.h"
@@ -491,7 +491,6 @@ void
cpu_reboot(volatile int howto, /* XXX volatile to keep gcc happy */
char *bootstr)
{
- int s = 0;
/* take a snap shot before clobbering any registers */
if (curlwp)
@@ -527,7 +526,7 @@ cpu_reboot(volatile int howto, /* XXX vo
}
/* Disable interrupts. */
- s = splhigh();
+ splhigh();
/* If rebooting and a dump is requested do it. */
if ((howto & (RB_DUMP | RB_HALT)) == RB_DUMP)
Index: src/sys/arch/mips/mips/mips_machdep.c
diff -u src/sys/arch/mips/mips/mips_machdep.c:1.257 src/sys/arch/mips/mips/mips_machdep.c:1.258
--- src/sys/arch/mips/mips/mips_machdep.c:1.257 Wed Oct 30 02:47:18 2013
+++ src/sys/arch/mips/mips/mips_machdep.c Sun Nov 10 13:27:15 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mips_machdep.c,v 1.257 2013/10/30 06:47:18 uebayasi Exp $ */
+/* $NetBSD: mips_machdep.c,v 1.258 2013/11/10 18:27:15 christos Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -111,7 +111,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: mips_machdep.c,v 1.257 2013/10/30 06:47:18 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mips_machdep.c,v 1.258 2013/11/10 18:27:15 christos Exp $");
#define __INTR_PRIVATE
#include "opt_cputype.h"
@@ -2174,7 +2174,7 @@ startlwp(void *arg)
{
ucontext_t * const uc = arg;
lwp_t * const l = curlwp;
- int error;
+ int error __diagused;
error = cpu_setmcontext(l, &uc->uc_mcontext, uc->uc_flags);
KASSERT(error == 0);
Index: src/sys/arch/mips/mips/pmap.c
diff -u src/sys/arch/mips/mips/pmap.c:1.208 src/sys/arch/mips/mips/pmap.c:1.209
--- src/sys/arch/mips/mips/pmap.c:1.208 Thu Jul 5 13:21:02 2012
+++ src/sys/arch/mips/mips/pmap.c Sun Nov 10 13:27:15 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.208 2012/07/05 17:21:02 matt Exp $ */
+/* $NetBSD: pmap.c,v 1.209 2013/11/10 18:27:15 christos Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.208 2012/07/05 17:21:02 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.209 2013/11/10 18:27:15 christos Exp $");
/*
* Manages physical address maps.
@@ -2111,6 +2111,7 @@ pmap_enter_pv(pmap_t pmap, vaddr_t va, s
{
struct vm_page_md * const md = VM_PAGE_TO_MD(pg);
pv_entry_t pv, npv, apv;
+/*###2114 [cc] error: variable 'gen' set but not used [-Werror=unused-but-set-variable]%%%*/
int16_t gen;
KASSERT(kpreempt_disabled());
@@ -2274,6 +2275,7 @@ again:
goto again;
#endif
#endif
+ __USE(gen);
}
npv = apv;
apv = NULL;
