Re: CVS commit: src/sys/arch/sparc64/sparc64
Michael macallan1...@gmail.com wrote Hello, on Thursday 22 August 2013 06:00:43 Takeshi Nakayama wrote: Module Name:src Committed By: nakayama Date: Thu Aug 22 10:00:43 UTC 2013 Modified Files: src/sys/arch/sparc64/sparc64: clock.c Log Message: Make timecounter tick-counter mandatory. This is going to bite us when we actually mess with the CPU's clock speed ( which is the whole point of using %stick and STICK ) This change provides a chance to select a prefer timecounter to users via sysctl kern.timecounter.hardware. stick-counter's quality is larger than tick-counter's one. The default choice becomes to stick-counter, so it's no problem. -- Takeshi Nakayama
CVS commit: src/usr.bin/nl
Module Name:src Committed By: wiz Date: Thu Sep 12 07:26:13 UTC 2013 Modified Files: src/usr.bin/nl: nl.1 Log Message: Update standards conformance. From jmc@openbsd. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/usr.bin/nl/nl.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/nl/nl.1 diff -u src/usr.bin/nl/nl.1:1.14 src/usr.bin/nl/nl.1:1.15 --- src/usr.bin/nl/nl.1:1.14 Mon Sep 9 09:02:25 2013 +++ src/usr.bin/nl/nl.1 Thu Sep 12 07:26:13 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: nl.1,v 1.14 2013/09/09 09:02:25 wiz Exp $ +.\ $NetBSD: nl.1,v 1.15 2013/09/12 07:26:13 wiz Exp $ .\ .\ Copyright (c) 1999 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -200,12 +200,9 @@ is 6. .Sh STANDARDS The .Nm -utility conforms to +utility is compliant with the .St -xpg4.2 -with the exception of not supporting the intermingling of the -.Ar file -operand with the options, which the standard considers an obsolescent feature -to be removed from a further issue. +specification. .Sh HISTORY The .Nm
CVS commit: src/sys/dev/ic
Module Name:src Committed By: martin Date: Thu Sep 12 11:23:37 UTC 2013 Modified Files: src/sys/dev/ic: adwlib.c Log Message: Remove unused ppr_able variable. To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/sys/dev/ic/adwlib.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/dev/ic/adwlib.c diff -u src/sys/dev/ic/adwlib.c:1.40 src/sys/dev/ic/adwlib.c:1.41 --- src/sys/dev/ic/adwlib.c:1.40 Sat Nov 13 13:52:00 2010 +++ src/sys/dev/ic/adwlib.c Thu Sep 12 11:23:37 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: adwlib.c,v 1.40 2010/11/13 13:52:00 uebayasi Exp $*/ +/* $NetBSD: adwlib.c,v 1.41 2013/09/12 11:23:37 martin Exp $*/ /* * Low level routines for the Advanced Systems Inc. SCSI controllers chips @@ -52,7 +52,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: adwlib.c,v 1.40 2010/11/13 13:52:00 uebayasi Exp $); +__KERNEL_RCSID(0, $NetBSD: adwlib.c,v 1.41 2013/09/12 11:23:37 martin Exp $); #include sys/param.h #include sys/systm.h @@ -551,7 +551,7 @@ AdwInitDriver(ADW_SOFTC *sc) int i; u_int16_t bios_mem[ADW_MC_BIOSLEN/2]; /* BIOS RISC Memory 0x40-0x8F. */ - u_int16_t wdtr_able = 0, sdtr_able, ppr_able, tagqng_able; + u_int16_t wdtr_able = 0, sdtr_able, /* ppr_able, */ tagqng_able; u_int8_t max_cmd[ADW_MAX_TID + 1]; u_int8_t tid; @@ -597,7 +597,7 @@ AdwInitDriver(ADW_SOFTC *sc) break; case ADW_CHIP_ASC38C1600: - ADW_READ_WORD_LRAM(iot, ioh, ADW_MC_PPR_ABLE, ppr_able); + /* ADW_READ_WORD_LRAM(iot, ioh, ADW_MC_PPR_ABLE, ppr_able); */ /* FALLTHROUGH */ case ADW_CHIP_ASC38C0800: ADW_READ_WORD_LRAM(iot, ioh, ADW_MC_WDTR_ABLE, wdtr_able);
CVS commit: src/sys/external/isc/atheros_hal/dist
Module Name:src
Committed By: martin
Date: Thu Sep 12 11:26:53 UTC 2013
Modified Files:
src/sys/external/isc/atheros_hal/dist: ah_eeprom_v3.c
Log Message:
Remove unused maxPower_t4 variable.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/external/isc/atheros_hal/dist/ah_eeprom_v3.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/external/isc/atheros_hal/dist/ah_eeprom_v3.c
diff -u src/sys/external/isc/atheros_hal/dist/ah_eeprom_v3.c:1.3 src/sys/external/isc/atheros_hal/dist/ah_eeprom_v3.c:1.4
--- src/sys/external/isc/atheros_hal/dist/ah_eeprom_v3.c:1.3 Mon Mar 7 11:25:42 2011
+++ src/sys/external/isc/atheros_hal/dist/ah_eeprom_v3.c Thu Sep 12 11:26:53 2013
@@ -14,7 +14,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: ah_eeprom_v3.c,v 1.3 2011/03/07 11:25:42 cegger Exp $
+ * $Id: ah_eeprom_v3.c,v 1.4 2013/09/12 11:26:53 martin Exp $
*/
#include opt_ah.h
@@ -181,7 +181,6 @@ eepromExpandPower5112(struct ath_hal *ah
EEPROM_POWER_EXPN_5112 *pPowerExpn)
{
int ii, jj, kk;
- int16_t maxPower_t4;
EXPN_DATA_PER_XPD_5112 *pExpnXPD;
/* ptr to array of info held per channel */
const EEPROM_DATA_PER_CHANNEL_5112 *pCalCh;
@@ -218,7 +217,6 @@ eepromExpandPower5112(struct ath_hal *ah
pCalCh-channelValue;
pPowerExpn-pDataPerChannel[ii].maxPower_t4 =
pCalCh-maxPower_t4;
- maxPower_t4 = pPowerExpn-pDataPerChannel[ii].maxPower_t4;
for (jj = 0; jj NUM_XPD_PER_CHANNEL; jj++)
pPowerExpn-pDataPerChannel[ii].pDataPerXPD[jj].numPcdacs = 0;
CVS commit: src/sys/external/isc/atheros_hal/dist
Module Name:src
Committed By: martin
Date: Thu Sep 12 11:38:23 UTC 2013
Modified Files:
src/sys/external/isc/atheros_hal/dist: ah_eeprom_v4k.c
Log Message:
Fix wrong for loop limit
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/isc/atheros_hal/dist/ah_eeprom_v4k.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/external/isc/atheros_hal/dist/ah_eeprom_v4k.c
diff -u src/sys/external/isc/atheros_hal/dist/ah_eeprom_v4k.c:1.4 src/sys/external/isc/atheros_hal/dist/ah_eeprom_v4k.c:1.5
--- src/sys/external/isc/atheros_hal/dist/ah_eeprom_v4k.c:1.4 Tue Dec 11 09:22:16 2012
+++ src/sys/external/isc/atheros_hal/dist/ah_eeprom_v4k.c Thu Sep 12 11:38:23 2013
@@ -239,7 +239,7 @@ v4kEepromReadCTLInfo(struct ath_hal *ah,
HALASSERT(AR5416_4K_NUM_CTLS = sizeof(ee-ee_rdEdgesPower)/NUM_EDGES);
for (i = 0; i AR5416_4K_NUM_CTLS ee-ee_base.ctlIndex[i] != 0; i++) {
- for (j = 0; j NUM_EDGES; j ++) {
+ for (j = 0; j AR5416_4K_NUM_BAND_EDGES; j ++) {
/* XXX Confirm this is the right thing to do when an invalid channel is stored */
if (ee-ee_base.ctlData[i].ctlEdges[CTL_CHAIN][j].bChannel == AR5416_BCHAN_UNUSED) {
rep[j].rdEdge = 0;
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: martin
Date: Thu Sep 12 11:42:26 UTC 2013
Modified Files:
src/sys/dev/ic: an.c
Log Message:
Eliminate (mostly) unused ostate variable
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sys/dev/ic/an.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/dev/ic/an.c
diff -u src/sys/dev/ic/an.c:1.59 src/sys/dev/ic/an.c:1.60
--- src/sys/dev/ic/an.c:1.59 Mon Apr 5 07:19:33 2010
+++ src/sys/dev/ic/an.c Thu Sep 12 11:42:26 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: an.c,v 1.59 2010/04/05 07:19:33 joerg Exp $ */
+/* $NetBSD: an.c,v 1.60 2013/09/12 11:42:26 martin Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
* Bill Paul wp...@ctr.columbia.edu. All rights reserved.
@@ -77,7 +77,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: an.c,v 1.59 2010/04/05 07:19:33 joerg Exp $);
+__KERNEL_RCSID(0, $NetBSD: an.c,v 1.60 2013/09/12 11:42:26 martin Exp $);
#include sys/param.h
@@ -1800,11 +1800,9 @@ an_newstate(struct ieee80211com *ic, enu
{
struct an_softc *sc = (struct an_softc *)ic-ic_ifp-if_softc;
struct ieee80211_node *ni = ic-ic_bss;
- enum ieee80211_state ostate;
int buflen;
- ostate = ic-ic_state;
- DPRINTF((an_newstate: %s - %s\n, ieee80211_state_name[ostate],
+ DPRINTF((an_newstate: %s - %s\n, ieee80211_state_name[ic-ic_state],
ieee80211_state_name[nstate]));
switch (nstate) {
CVS commit: src/sys/external/isc/atheros_hal/dist/ar5212
Module Name:src
Committed By: martin
Date: Thu Sep 12 11:44:08 UTC 2013
Modified Files:
src/sys/external/isc/atheros_hal/dist/ar5212: ar2316.c
Log Message:
Remove unused variable
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/isc/atheros_hal/dist/ar5212/ar2316.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/external/isc/atheros_hal/dist/ar5212/ar2316.c
diff -u src/sys/external/isc/atheros_hal/dist/ar5212/ar2316.c:1.2 src/sys/external/isc/atheros_hal/dist/ar5212/ar2316.c:1.3
--- src/sys/external/isc/atheros_hal/dist/ar5212/ar2316.c:1.2 Tue Jan 6 06:03:57 2009
+++ src/sys/external/isc/atheros_hal/dist/ar5212/ar2316.c Thu Sep 12 11:44:08 2013
@@ -14,7 +14,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: ar2316.c,v 1.2 2009/01/06 06:03:57 mrg Exp $
+ * $Id: ar2316.c,v 1.3 2013/09/12 11:44:08 martin Exp $
*/
#include opt_ah.h
@@ -305,13 +305,12 @@ ar2316FillVpdTable(uint32_t pdGainIdx, i
const int16_t *pwrList, const int16_t *VpdList,
uint16_t numIntercepts, uint16_t retVpdList[][64])
{
- uint16_t ii, jj, kk;
+ uint16_t ii, kk;
int16_t currPwr = (int16_t)(2*Pmin);
/* since Pmin is pwr*2 and pwrList is 4*pwr */
uint32_t idxL = 0, idxR = 0;
ii = 0;
- jj = 0;
if (numIntercepts 2)
return AH_FALSE;
CVS commit: src/sys/external/isc/atheros_hal/dist/ar5212
Module Name:src
Committed By: martin
Date: Thu Sep 12 12:03:33 UTC 2013
Modified Files:
src/sys/external/isc/atheros_hal/dist/ar5212: ar2317.c
Log Message:
Get rid of unused variables
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/isc/atheros_hal/dist/ar5212/ar2317.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/external/isc/atheros_hal/dist/ar5212/ar2317.c
diff -u src/sys/external/isc/atheros_hal/dist/ar5212/ar2317.c:1.3 src/sys/external/isc/atheros_hal/dist/ar5212/ar2317.c:1.4
--- src/sys/external/isc/atheros_hal/dist/ar5212/ar2317.c:1.3 Tue Jan 6 06:03:57 2009
+++ src/sys/external/isc/atheros_hal/dist/ar5212/ar2317.c Thu Sep 12 12:03:33 2013
@@ -14,7 +14,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: ar2317.c,v 1.3 2009/01/06 06:03:57 mrg Exp $
+ * $Id: ar2317.c,v 1.4 2013/09/12 12:03:33 martin Exp $
*/
#include opt_ah.h
@@ -282,13 +282,12 @@ ar2317FillVpdTable(uint32_t pdGainIdx, i
const int16_t *pwrList, const int16_t *VpdList,
uint16_t numIntercepts, uint16_t retVpdList[][64])
{
- uint16_t ii, jj, kk;
+ uint16_t ii, kk;
int16_t currPwr = (int16_t)(2*Pmin);
/* since Pmin is pwr*2 and pwrList is 4*pwr */
uint32_t idxL = 0, idxR = 0;
ii = 0;
- jj = 0;
if (numIntercepts 2)
return AH_FALSE;
@@ -611,14 +610,12 @@ ar2317GetMaxPower(struct ath_hal *ah, co
{
uint32_t ii;
uint16_t Pmax=0,numVpd;
- uint16_t vpdmax;
for (ii=0; ii MAX_NUM_PDGAINS_PER_CHANNEL; ii++) {
/* work forwards cuase lowest pdGain for highest power */
numVpd = data-pDataPerPDGain[ii].numVpd;
if (numVpd 0) {
Pmax = data-pDataPerPDGain[ii].pwr_t4[numVpd-1];
- vpdmax = data-pDataPerPDGain[ii].Vpd[numVpd-1];
return(Pmax);
}
}
CVS commit: src/sys/external/isc/atheros_hal/dist/ar5212
Module Name:src
Committed By: martin
Date: Thu Sep 12 12:04:37 UTC 2013
Modified Files:
src/sys/external/isc/atheros_hal/dist/ar5212: ar2413.c
Log Message:
Remove unused variable
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/isc/atheros_hal/dist/ar5212/ar2413.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/external/isc/atheros_hal/dist/ar5212/ar2413.c
diff -u src/sys/external/isc/atheros_hal/dist/ar5212/ar2413.c:1.2 src/sys/external/isc/atheros_hal/dist/ar5212/ar2413.c:1.3
--- src/sys/external/isc/atheros_hal/dist/ar5212/ar2413.c:1.2 Tue Jan 6 06:03:57 2009
+++ src/sys/external/isc/atheros_hal/dist/ar5212/ar2413.c Thu Sep 12 12:04:37 2013
@@ -14,7 +14,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: ar2413.c,v 1.2 2009/01/06 06:03:57 mrg Exp $
+ * $Id: ar2413.c,v 1.3 2013/09/12 12:04:37 martin Exp $
*/
#include opt_ah.h
@@ -299,13 +299,12 @@ ar2413FillVpdTable(uint32_t pdGainIdx, i
const int16_t *pwrList, const uint16_t *VpdList,
uint16_t numIntercepts, uint16_t retVpdList[][64])
{
- uint16_t ii, jj, kk;
+ uint16_t ii, kk;
int16_t currPwr = (int16_t)(2*Pmin);
/* since Pmin is pwr*2 and pwrList is 4*pwr */
uint32_t idxL = 0, idxR = 0;
ii = 0;
- jj = 0;
if (numIntercepts 2)
return AH_FALSE;
CVS commit: src/sys/external/isc/atheros_hal/dist/ar5212
Module Name:src
Committed By: martin
Date: Thu Sep 12 12:05:52 UTC 2013
Modified Files:
src/sys/external/isc/atheros_hal/dist/ar5212: ar2425.c
Log Message:
Remove unused variable
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/isc/atheros_hal/dist/ar5212/ar2425.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/external/isc/atheros_hal/dist/ar5212/ar2425.c
diff -u src/sys/external/isc/atheros_hal/dist/ar5212/ar2425.c:1.3 src/sys/external/isc/atheros_hal/dist/ar5212/ar2425.c:1.4
--- src/sys/external/isc/atheros_hal/dist/ar5212/ar2425.c:1.3 Sun Feb 20 11:21:03 2011
+++ src/sys/external/isc/atheros_hal/dist/ar5212/ar2425.c Thu Sep 12 12:05:52 2013
@@ -14,7 +14,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: ar2425.c,v 1.3 2011/02/20 11:21:03 jmcneill Exp $
+ * $Id: ar2425.c,v 1.4 2013/09/12 12:05:52 martin Exp $
*/
#include opt_ah.h
@@ -301,13 +301,12 @@ ar2425FillVpdTable(uint32_t pdGainIdx, i
uint16_t numIntercepts,
uint16_t retVpdList[][64])
{
- uint16_t ii, jj, kk;
+ uint16_t ii, kk;
int16_t currPwr = (int16_t)(2*Pmin);
/* since Pmin is pwr*2 and pwrList is 4*pwr */
uint32_t idxL = 0, idxR = 0;
ii = 0;
- jj = 0;
if (numIntercepts 2)
return AH_FALSE;
CVS commit: src/sys/external/isc/atheros_hal/dist/ar5212
Module Name:src
Committed By: martin
Date: Thu Sep 12 12:07:01 UTC 2013
Modified Files:
src/sys/external/isc/atheros_hal/dist/ar5212: ar5413.c
Log Message:
Remove unused variable
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/isc/atheros_hal/dist/ar5212/ar5413.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/external/isc/atheros_hal/dist/ar5212/ar5413.c
diff -u src/sys/external/isc/atheros_hal/dist/ar5212/ar5413.c:1.3 src/sys/external/isc/atheros_hal/dist/ar5212/ar5413.c:1.4
--- src/sys/external/isc/atheros_hal/dist/ar5212/ar5413.c:1.3 Sun Feb 20 11:21:03 2011
+++ src/sys/external/isc/atheros_hal/dist/ar5212/ar5413.c Thu Sep 12 12:07:01 2013
@@ -14,7 +14,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: ar5413.c,v 1.3 2011/02/20 11:21:03 jmcneill Exp $
+ * $Id: ar5413.c,v 1.4 2013/09/12 12:07:01 martin Exp $
*/
#include opt_ah.h
@@ -335,13 +335,12 @@ ar5413FillVpdTable(uint32_t pdGainIdx, i
uint16_t numIntercepts,
uint16_t retVpdList[][64])
{
- uint16_t ii, jj, kk;
+ uint16_t ii, kk;
int16_t currPwr = (int16_t)(2*Pmin);
/* since Pmin is pwr*2 and pwrList is 4*pwr */
uint32_t idxL = 0, idxR = 0;
ii = 0;
- jj = 0;
if (numIntercepts 2)
return AH_FALSE;
CVS commit: src/sys/external/isc/atheros_hal/dist/ar5416
Module Name:src
Committed By: martin
Date: Thu Sep 12 12:08:49 UTC 2013
Modified Files:
src/sys/external/isc/atheros_hal/dist/ar5416: ar5416_beacon.c
Log Message:
Remove unsued variable
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_beacon.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/external/isc/atheros_hal/dist/ar5416/ar5416_beacon.c
diff -u src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_beacon.c:1.1.1.1 src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_beacon.c:1.2
--- src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_beacon.c:1.1.1.1 Thu Dec 11 04:46:47 2008
+++ src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_beacon.c Thu Sep 12 12:08:49 2013
@@ -14,7 +14,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: ar5416_beacon.c,v 1.1.1.1 2008/12/11 04:46:47 alc Exp $
+ * $Id: ar5416_beacon.c,v 1.2 2013/09/12 12:08:49 martin Exp $
*/
#include opt_ah.h
@@ -138,7 +138,7 @@ ar5416ResetStaBeaconTimers(struct ath_ha
void
ar5416SetStaBeaconTimers(struct ath_hal *ah, const HAL_BEACON_STATE *bs)
{
- uint32_t nextTbtt, nextdtim,beaconintval, dtimperiod;
+ uint32_t nextTbtt,beaconintval, dtimperiod;
HALASSERT(bs-bs_intval != 0);
@@ -214,7 +214,6 @@ ar5416SetStaBeaconTimers(struct ath_hal
nextTbtt = bs-bs_nextdtim;
else
nextTbtt = bs-bs_nexttbtt;
- nextdtim = bs-bs_nextdtim;
OS_REG_WRITE(ah, AR_NEXT_DTIM,
TU_TO_USEC(bs-bs_nextdtim - SLEEP_SLOP));
CVS commit: src/sys/external/isc/atheros_hal/dist/ar5416
Module Name:src
Committed By: martin
Date: Thu Sep 12 12:10:11 UTC 2013
Modified Files:
src/sys/external/isc/atheros_hal/dist/ar5416: ar9280_attach.c
Log Message:
Remove unused variable
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/isc/atheros_hal/dist/ar5416/ar9280_attach.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/external/isc/atheros_hal/dist/ar5416/ar9280_attach.c
diff -u src/sys/external/isc/atheros_hal/dist/ar5416/ar9280_attach.c:1.2 src/sys/external/isc/atheros_hal/dist/ar5416/ar9280_attach.c:1.3
--- src/sys/external/isc/atheros_hal/dist/ar5416/ar9280_attach.c:1.2 Mon Feb 21 11:06:38 2011
+++ src/sys/external/isc/atheros_hal/dist/ar5416/ar9280_attach.c Thu Sep 12 12:10:11 2013
@@ -306,13 +306,12 @@ ar9280ConfigPCIE(struct ath_hal *ah, HAL
static void
ar9280WriteIni(struct ath_hal *ah, HAL_CHANNEL_INTERNAL *chan)
{
- u_int modesIndex, freqIndex;
+ u_int modesIndex;
int regWrites = 0;
/* Setup the indices for the next set of register array writes */
/* XXX Ignore 11n dynamic mode on the AR5416 for the moment */
if (IS_CHAN_2GHZ(chan)) {
- freqIndex = 2;
if (IS_CHAN_HT40(chan))
modesIndex = 3;
else if (IS_CHAN_108G(chan))
@@ -320,7 +319,6 @@ ar9280WriteIni(struct ath_hal *ah, HAL_C
else
modesIndex = 4;
} else {
- freqIndex = 1;
if (IS_CHAN_HT40(chan) ||
IS_CHAN_TURBO(chan))
modesIndex = 2;
CVS commit: src/sys/external/isc/atheros_hal/dist/ar5416
Module Name:src
Committed By: martin
Date: Thu Sep 12 12:11:12 UTC 2013
Modified Files:
src/sys/external/isc/atheros_hal/dist/ar5416: ar9285_attach.c
Log Message:
Remove unused variable
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/sys/external/isc/atheros_hal/dist/ar5416/ar9285_attach.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/external/isc/atheros_hal/dist/ar5416/ar9285_attach.c
diff -u src/sys/external/isc/atheros_hal/dist/ar5416/ar9285_attach.c:1.1 src/sys/external/isc/atheros_hal/dist/ar5416/ar9285_attach.c:1.2
--- src/sys/external/isc/atheros_hal/dist/ar5416/ar9285_attach.c:1.1 Mon Feb 21 11:06:38 2011
+++ src/sys/external/isc/atheros_hal/dist/ar5416/ar9285_attach.c Thu Sep 12 12:11:12 2013
@@ -291,12 +291,11 @@ ar9285ConfigPCIE(struct ath_hal *ah, HAL
static void
ar9285WriteIni(struct ath_hal *ah, HAL_CHANNEL_INTERNAL *chan)
{
- u_int modesIndex, freqIndex;
+ u_int modesIndex;
int regWrites = 0;
/* Setup the indices for the next set of register array writes */
/* XXX Ignore 11n dynamic mode on the AR5416 for the moment */
- freqIndex = 2;
if (IS_CHAN_HT40(chan))
modesIndex = 3;
else if (IS_CHAN_108G(chan))
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: martin
Date: Thu Sep 12 12:17:53 UTC 2013
Modified Files:
src/sys/dev/ic: ath.c
Log Message:
Remove unused variable
To generate a diff of this commit:
cvs rdiff -u -r1.115 -r1.116 src/sys/dev/ic/ath.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/dev/ic/ath.c
diff -u src/sys/dev/ic/ath.c:1.115 src/sys/dev/ic/ath.c:1.116
--- src/sys/dev/ic/ath.c:1.115 Sun Jan 27 12:48:56 2013
+++ src/sys/dev/ic/ath.c Thu Sep 12 12:17:53 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ath.c,v 1.115 2013/01/27 12:48:56 jmcneill Exp $ */
+/* $NetBSD: ath.c,v 1.116 2013/09/12 12:17:53 martin Exp $ */
/*-
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -41,7 +41,7 @@
__FBSDID($FreeBSD: src/sys/dev/ath/if_ath.c,v 1.104 2005/09/16 10:09:23 ru Exp $);
#endif
#ifdef __NetBSD__
-__KERNEL_RCSID(0, $NetBSD: ath.c,v 1.115 2013/01/27 12:48:56 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: ath.c,v 1.116 2013/09/12 12:17:53 martin Exp $);
#endif
/*
@@ -4353,7 +4353,6 @@ ath_stoprecv(struct ath_softc *sc)
((struct ath_desc *)((char *)(_sc)-sc_rxdma.dd_desc + \
((_pa) - (_sc)-sc_rxdma.dd_desc_paddr)))
struct ath_hal *ah = sc-sc_ah;
- u_int64_t tsf;
ath_hal_stoppcurecv(ah); /* disable PCU */
ath_hal_setrxfilter(ah, 0); /* clear recv filter */
@@ -4366,7 +4365,6 @@ ath_stoprecv(struct ath_softc *sc)
(void *)(uintptr_t) ath_hal_getrxbuf(ah), sc-sc_rxlink);
STAILQ_FOREACH(bf, sc-sc_rxbuf, bf_list) {
struct ath_desc *ds = bf-bf_desc;
- tsf = ath_hal_gettsf64(sc-sc_ah);
HAL_STATUS status = ath_hal_rxprocdesc(ah, ds,
bf-bf_daddr, PA2DESC(sc, ds-ds_link),
ds-ds_rxstat);
CVS commit: src/sys/dev/bluetooth
Module Name:src
Committed By: martin
Date: Thu Sep 12 12:20:01 UTC 2013
Modified Files:
src/sys/dev/bluetooth: btkbd.c
Log Message:
#ifdef the npress variable, so it is only defined (and initialized) when
it is also used.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/bluetooth/btkbd.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/dev/bluetooth/btkbd.c
diff -u src/sys/dev/bluetooth/btkbd.c:1.15 src/sys/dev/bluetooth/btkbd.c:1.16
--- src/sys/dev/bluetooth/btkbd.c:1.15 Sat Oct 27 17:18:15 2012
+++ src/sys/dev/bluetooth/btkbd.c Thu Sep 12 12:20:01 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: btkbd.c,v 1.15 2012/10/27 17:18:15 chs Exp $ */
+/* $NetBSD: btkbd.c,v 1.16 2013/09/12 12:20:01 martin Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: btkbd.c,v 1.15 2012/10/27 17:18:15 chs Exp $);
+__KERNEL_RCSID(0, $NetBSD: btkbd.c,v 1.16 2013/09/12 12:20:01 martin Exp $);
#include sys/param.h
#include sys/callout.h
@@ -541,9 +541,11 @@ btkbd_input(struct bthidev *hidev, uint8
if (sc-sc_rawkbd) {
u_char cbuf[MAXKEYS * 2];
int c;
- int npress;
+#ifdef BTKBD_REPEAT
+ int npress = 0;
+#endif
- for (npress = i = j = 0 ; i nkeys ; i++) {
+ for (i = j = 0 ; i nkeys ; i++) {
key = ibuf[i];
c = btkbd_trtab[key CODEMASK];
if (c == NN)
CVS commit: src/sys/dev
Module Name:src
Committed By: martin
Date: Thu Sep 12 12:22:41 UTC 2013
Modified Files:
src/sys/dev: ccd.c
Log Message:
#ifdef a few variable declarations/initializations to match their use
To generate a diff of this commit:
cvs rdiff -u -r1.144 -r1.145 src/sys/dev/ccd.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/dev/ccd.c
diff -u src/sys/dev/ccd.c:1.144 src/sys/dev/ccd.c:1.145
--- src/sys/dev/ccd.c:1.144 Sat Apr 27 17:13:32 2013
+++ src/sys/dev/ccd.c Thu Sep 12 12:22:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ccd.c,v 1.144 2013/04/27 17:13:32 christos Exp $ */
+/* $NetBSD: ccd.c,v 1.145 2013/09/12 12:22:40 martin Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999, 2007, 2009 The NetBSD Foundation, Inc.
@@ -88,7 +88,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ccd.c,v 1.144 2013/04/27 17:13:32 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: ccd.c,v 1.145 2013/09/12 12:22:40 martin Exp $);
#include sys/param.h
#include sys/systm.h
@@ -1560,9 +1560,11 @@ MODULE(MODULE_CLASS_DRIVER, ccd, NULL);
static int
ccd_modcmd(modcmd_t cmd, void *arg)
{
- int bmajor, cmajor, error = 0;
+ int error = 0;
+#ifdef _MODULE
+ int bmajor = -1, cmajor = -1;
+#endif
- bmajor = cmajor = -1;
switch (cmd) {
case MODULE_CMD_INIT:
CVS commit: src/sys/dev/scsipi
Module Name:src
Committed By: martin
Date: Thu Sep 12 12:26:13 UTC 2013
Modified Files:
src/sys/dev/scsipi: cd.c
Log Message:
Remove unused variables
To generate a diff of this commit:
cvs rdiff -u -r1.312 -r1.313 src/sys/dev/scsipi/cd.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/dev/scsipi/cd.c
diff -u src/sys/dev/scsipi/cd.c:1.312 src/sys/dev/scsipi/cd.c:1.313
--- src/sys/dev/scsipi/cd.c:1.312 Tue Jul 2 15:05:53 2013
+++ src/sys/dev/scsipi/cd.c Thu Sep 12 12:26:13 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cd.c,v 1.312 2013/07/02 15:05:53 reinoud Exp $ */
+/* $NetBSD: cd.c,v 1.313 2013/09/12 12:26:13 martin Exp $ */
/*-
* Copyright (c) 1998, 2001, 2003, 2004, 2005, 2008 The NetBSD Foundation,
@@ -50,7 +50,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cd.c,v 1.312 2013/07/02 15:05:53 reinoud Exp $);
+__KERNEL_RCSID(0, $NetBSD: cd.c,v 1.313 2013/09/12 12:26:13 martin Exp $);
#include sys/param.h
#include sys/systm.h
@@ -3179,12 +3179,12 @@ mmc_gettrackinfo_cdrom(struct scsipi_per
struct scsipi_read_tocgtoc_cmd;
struct scsipi_toc_header *toc_hdr;
struct scsipi_toc_rawtoc *rawtoc;
- uint32_t track_start, track_end, track_size;
+ uint32_t track_start, track_size;
uint32_t last_recorded, next_writable;
uint32_t lba, next_track_start, lead_out;
const uint32_t buffer_size = 4 * 1024; /* worst case TOC estimate */
uint8_t *buffer;
- uint8_t track_sessionnr, last_tracknr, sessionnr, adr, tno, point;
+ uint8_t track_sessionnr, sessionnr, adr, tno, point;
uint8_t control, tmin, tsec, tframe, pmin, psec, pframe;
int size, req_size;
int error, flags;
@@ -3243,13 +3243,11 @@ mmc_gettrackinfo_cdrom(struct scsipi_per
rawtoc = (struct scsipi_toc_rawtoc *) (buffer + 4);
track_start = 0;
- track_end= 0;
track_size = 0;
last_recorded= 0;
next_writable= 0;
flags= 0;
- last_tracknr = 1;
next_track_start = 0;
track_sessionnr = MAXTRACK; /* by definition */
lead_out = 0;
@@ -3285,7 +3283,7 @@ mmc_gettrackinfo_cdrom(struct scsipi_per
}
if (point = 0x63) {
/* CD's ok, DVD are glued */
-last_tracknr = point;
+/* last_tracknr = point; */
}
if (sessionnr == track_sessionnr) {
last_recorded = lead_out;
CVS commit: src/sys/dev
Module Name:src
Committed By: martin
Date: Thu Sep 12 12:28:49 UTC 2013
Modified Files:
src/sys/dev: cgd.c
Log Message:
#ifdef variable declarations/initializations like their use
To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 src/sys/dev/cgd.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/dev/cgd.c
diff -u src/sys/dev/cgd.c:1.81 src/sys/dev/cgd.c:1.82
--- src/sys/dev/cgd.c:1.81 Thu May 30 08:28:13 2013
+++ src/sys/dev/cgd.c Thu Sep 12 12:28:49 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cgd.c,v 1.81 2013/05/30 08:28:13 martin Exp $ */
+/* $NetBSD: cgd.c,v 1.82 2013/09/12 12:28:49 martin Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cgd.c,v 1.81 2013/05/30 08:28:13 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: cgd.c,v 1.82 2013/09/12 12:28:49 martin Exp $);
#include sys/types.h
#include sys/param.h
@@ -518,7 +518,6 @@ cgdioctl(dev_t dev, u_long cmd, void *da
{
struct cgd_softc *cs;
struct dk_softc *dksc;
- struct disk *dk;
int part = DISKPART(dev);
int pmask = 1 part;
@@ -529,7 +528,6 @@ cgdioctl(dev_t dev, u_long cmd, void *da
case CGDIOCGET: /* don't call cgd_spawn() if the device isn't there */
cs = NULL;
dksc = NULL;
- dk = NULL;
break;
case CGDIOCSET:
case CGDIOCCLR:
@@ -539,7 +537,6 @@ cgdioctl(dev_t dev, u_long cmd, void *da
default:
GETCGD_SOFTC(cs, dev);
dksc = cs-sc_dksc;
- dk = dksc-sc_dkdev;
break;
}
@@ -985,9 +982,11 @@ CFDRIVER_DECL(cgd, DV_DISK, NULL);
static int
cgd_modcmd(modcmd_t cmd, void *arg)
{
- int bmajor, cmajor, error = 0;
+ int error = 0;
- bmajor = cmajor = -1;
+#ifdef _MODULE
+ int bmajor = -1, cmajor = -1;
+#endif
switch (cmd) {
case MODULE_CMD_INIT:
CVS commit: src/sys/dev/sun
Module Name:src
Committed By: martin
Date: Thu Sep 12 12:42:18 UTC 2013
Modified Files:
src/sys/dev/sun: cgsix.c
Log Message:
Simplify CG6_DRAW() and CG6_BLIT() macros so gcc 4.8.1 does not warn about
them - assembler looks good, but Michael, can you please test nevertheless?
To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/sys/dev/sun/cgsix.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/dev/sun/cgsix.c
diff -u src/sys/dev/sun/cgsix.c:1.61 src/sys/dev/sun/cgsix.c:1.62
--- src/sys/dev/sun/cgsix.c:1.61 Tue Jul 30 19:24:26 2013
+++ src/sys/dev/sun/cgsix.c Thu Sep 12 12:42:18 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cgsix.c,v 1.61 2013/07/30 19:24:26 macallan Exp $ */
+/* $NetBSD: cgsix.c,v 1.62 2013/09/12 12:42:18 martin Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cgsix.c,v 1.61 2013/07/30 19:24:26 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: cgsix.c,v 1.62 2013/09/12 12:42:18 martin Exp $);
#include sys/param.h
#include sys/systm.h
@@ -285,12 +285,12 @@ int cgsix_use_rasterconsole = 1;
/*
* Run a blitter command
*/
-#define CG6_BLIT(f) { volatile uint32_t foo; foo = f-fbc_blit; }
+#define CG6_BLIT(f) { (void)f-fbc_blit; }
/*
* Run a drawing command
*/
-#define CG6_DRAW(f) { volatile uint32_t foo; foo = f-fbc_draw; }
+#define CG6_DRAW(f) { (void)f-fbc_draw; }
/*
* Wait for the whole engine to go idle. This may not matter in our case;
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src
Committed By: martin
Date: Thu Sep 12 12:45:53 UTC 2013
Modified Files:
src/sys/arch/sparc64/sparc64: clock.c
Log Message:
Slightly rearange stopcounter() to compile warning-free with newer gcc
To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 src/sys/arch/sparc64/sparc64/clock.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/sparc64/sparc64/clock.c
diff -u src/sys/arch/sparc64/sparc64/clock.c:1.112 src/sys/arch/sparc64/sparc64/clock.c:1.113
--- src/sys/arch/sparc64/sparc64/clock.c:1.112 Tue Sep 10 16:03:48 2013
+++ src/sys/arch/sparc64/sparc64/clock.c Thu Sep 12 12:45:53 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.112 2013/09/10 16:03:48 macallan Exp $ */
+/* $NetBSD: clock.c,v 1.113 2013/09/12 12:45:53 martin Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -55,7 +55,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: clock.c,v 1.112 2013/09/10 16:03:48 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: clock.c,v 1.113 2013/09/12 12:45:53 martin Exp $);
#include opt_multiprocessor.h
@@ -352,10 +352,11 @@ timerattach(device_t parent, device_t se
void
stopcounter(struct timer_4u *creg)
{
+ volatile struct timer_4u *reg = creg;
+
/* Stop the clock */
- volatile int discard;
- discard = creg-t_limit;
- creg-t_limit = 0;
+ (void)reg-t_limit;
+ reg-t_limit = 0;
}
/*
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: martin
Date: Thu Sep 12 12:54:39 UTC 2013
Modified Files:
src/sys/dev/ic: com.c
Log Message:
Minor tweaks for newer gcc
To generate a diff of this commit:
cvs rdiff -u -r1.315 -r1.316 src/sys/dev/ic/com.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/dev/ic/com.c
diff -u src/sys/dev/ic/com.c:1.315 src/sys/dev/ic/com.c:1.316
--- src/sys/dev/ic/com.c:1.315 Tue Sep 3 15:32:55 2013
+++ src/sys/dev/ic/com.c Thu Sep 12 12:54:39 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: com.c,v 1.315 2013/09/03 15:32:55 jmcneill Exp $ */
+/* $NetBSD: com.c,v 1.316 2013/09/12 12:54:39 martin Exp $ */
/*-
* Copyright (c) 1998, 1999, 2004, 2008 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: com.c,v 1.315 2013/09/03 15:32:55 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: com.c,v 1.316 2013/09/12 12:54:39 martin Exp $);
#include opt_com.h
#include opt_ddb.h
@@ -92,6 +92,7 @@ __KERNEL_RCSID(0, $NetBSD: com.c,v 1.31
do { \
console_debugger(); \
cn_trapped = 1; \
+ (void)cn_trapped; \
} while (/* CONSTCOND */ 0)
#include sys/param.h
@@ -1964,7 +1965,7 @@ again: do {
lsr = CSR_READ_1(regsp, COM_REG_LSR);
if (ISSET(lsr, LSR_BI)) {
- int cn_trapped = 0;
+ int cn_trapped = 0; /* see above: cn_trap() */
cn_check_magic(sc-sc_tty-t_dev,
CNC_BREAK, com_cnm_state);
@@ -2184,7 +2185,7 @@ com_common_getc(dev_t dev, struct com_re
c = CSR_READ_1(regsp, COM_REG_RXDATA);
stat = CSR_READ_1(regsp, COM_REG_IIR);
{
- int cn_trapped = 0; /* unused */
+ int cn_trapped = 0; /* required by cn_trap, see above */
#ifdef DDB
extern int db_active;
if (!db_active)
CVS commit: src/sys/arch/sparc64/dev
Module Name:src
Committed By: martin
Date: Thu Sep 12 12:57:48 UTC 2013
Modified Files:
src/sys/arch/sparc64/dev: consinit.c
Log Message:
Remove an unused variable, avoid unused variable warning.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/sparc64/dev/consinit.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/sparc64/dev/consinit.c
diff -u src/sys/arch/sparc64/dev/consinit.c:1.26 src/sys/arch/sparc64/dev/consinit.c:1.27
--- src/sys/arch/sparc64/dev/consinit.c:1.26 Tue Jul 31 13:35:48 2012
+++ src/sys/arch/sparc64/dev/consinit.c Thu Sep 12 12:57:48 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: consinit.c,v 1.26 2012/07/31 13:35:48 martin Exp $ */
+/* $NetBSD: consinit.c,v 1.27 2013/09/12 12:57:48 martin Exp $ */
/*-
* Copyright (c) 1999 Eduardo E. Horvath
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: consinit.c,v 1.26 2012/07/31 13:35:48 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: consinit.c,v 1.27 2013/09/12 12:57:48 martin Exp $);
#include opt_ddb.h
#include pcons.h
@@ -169,7 +169,6 @@ int prom_stdout_node;
void
consinit(void)
{
- int chosen;
char buffer[128];
const char *consname = unknown;
@@ -178,8 +177,6 @@ consinit(void)
if (cn_tab != consdev_prom)
return;
- chosen = prom_finddevice(/chosen);
-
if ((prom_stdin_node = prom_instance_to_package(prom_stdin())) == 0) {
printf(WARNING: no PROM stdin\n);
}
@@ -210,6 +207,9 @@ consinit(void)
consname = buffer;
}
DBPRINT((console is %s\n, consname));
+#ifndef DEBUG
+ (void)consname;
+#endif
/* Initialize PROM console */
(*cn_tab-cn_probe)(cn_tab);
CVS commit: src/sys/opencrypto
Module Name:src Committed By: martin Date: Thu Sep 12 13:02:37 UTC 2013 Modified Files: src/sys/opencrypto: cryptodev.c Log Message: Fix return value of cryptodev_msessionfin. To generate a diff of this commit: cvs rdiff -u -r1.68 -r1.69 src/sys/opencrypto/cryptodev.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/opencrypto/cryptodev.c diff -u src/sys/opencrypto/cryptodev.c:1.68 src/sys/opencrypto/cryptodev.c:1.69 --- src/sys/opencrypto/cryptodev.c:1.68 Mon Jul 4 16:06:17 2011 +++ src/sys/opencrypto/cryptodev.c Thu Sep 12 13:02:37 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: cryptodev.c,v 1.68 2011/07/04 16:06:17 joerg Exp $ */ +/* $NetBSD: cryptodev.c,v 1.69 2013/09/12 13:02:37 martin Exp $ */ /* $FreeBSD: src/sys/opencrypto/cryptodev.c,v 1.4.2.4 2003/06/03 00:09:02 sam Exp $ */ /* $OpenBSD: cryptodev.c,v 1.53 2002/07/10 22:21:30 mickey Exp $ */ @@ -64,7 +64,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: cryptodev.c,v 1.68 2011/07/04 16:06:17 joerg Exp $); +__KERNEL_RCSID(0, $NetBSD: cryptodev.c,v 1.69 2013/09/12 13:02:37 martin Exp $); #include sys/param.h #include sys/systm.h @@ -1767,7 +1767,7 @@ cryptodev_msessionfin(struct fcrypt *fcr mutex_enter(crypto_mtx); } mutex_exit(crypto_mtx); - return 0; + return error; } /*
CVS commit: src/sys/opencrypto
Module Name:src Committed By: martin Date: Thu Sep 12 13:12:35 UTC 2013 Modified Files: src/sys/opencrypto: cryptosoft.c Log Message: Remove unused variable To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/sys/opencrypto/cryptosoft.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/opencrypto/cryptosoft.c diff -u src/sys/opencrypto/cryptosoft.c:1.42 src/sys/opencrypto/cryptosoft.c:1.43 --- src/sys/opencrypto/cryptosoft.c:1.42 Mon Jun 24 04:21:20 2013 +++ src/sys/opencrypto/cryptosoft.c Thu Sep 12 13:12:35 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: cryptosoft.c,v 1.42 2013/06/24 04:21:20 riastradh Exp $ */ +/* $NetBSD: cryptosoft.c,v 1.43 2013/09/12 13:12:35 martin Exp $ */ /* $FreeBSD: src/sys/opencrypto/cryptosoft.c,v 1.2.2.1 2002/11/21 23:34:23 sam Exp $ */ /* $OpenBSD: cryptosoft.c,v 1.35 2002/04/26 08:43:50 deraadt Exp $ */ @@ -24,7 +24,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: cryptosoft.c,v 1.42 2013/06/24 04:21:20 riastradh Exp $); +__KERNEL_RCSID(0, $NetBSD: cryptosoft.c,v 1.43 2013/09/12 13:12:35 martin Exp $); #include sys/param.h #include sys/systm.h @@ -1045,7 +1045,6 @@ swcr_freesession(void *arg, u_int64_t ti struct swcr_data *swd; const struct swcr_enc_xform *txf; const struct swcr_auth_hash *axf; - const struct swcr_comp_algo *cxf; u_int32_t sid = ((u_int32_t) tid) 0x; if (sid swcr_sesnum || swcr_sessions == NULL || @@ -1130,7 +1129,6 @@ swcr_freesession(void *arg, u_int64_t ti case CRYPTO_DEFLATE_COMP: case CRYPTO_DEFLATE_COMP_NOGROW: case CRYPTO_GZIP_COMP: - cxf = swd-sw_cxf; break; }
CVS commit: src/sys/arch/arm/arm32
Module Name:src
Committed By: kiyohara
Date: Thu Sep 12 14:45:18 UTC 2013
Modified Files:
src/sys/arch/arm/arm32: pmap.c
Log Message:
Fix VIVT cache operation. Tested on Kirkwood machines.
To generate a diff of this commit:
cvs rdiff -u -r1.263 -r1.264 src/sys/arch/arm/arm32/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/arm/arm32/pmap.c
diff -u src/sys/arch/arm/arm32/pmap.c:1.263 src/sys/arch/arm/arm32/pmap.c:1.264
--- src/sys/arch/arm/arm32/pmap.c:1.263 Sun Aug 18 06:50:31 2013
+++ src/sys/arch/arm/arm32/pmap.c Thu Sep 12 14:45:18 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.263 2013/08/18 06:50:31 matt Exp $ */
+/* $NetBSD: pmap.c,v 1.264 2013/09/12 14:45:18 kiyohara Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -209,7 +209,7 @@
#include arm/locore.h
#include arm/arm32/katelib.h
-__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.263 2013/08/18 06:50:31 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap.c,v 1.264 2013/09/12 14:45:18 kiyohara Exp $);
#ifdef PMAP_DEBUG
@@ -2992,7 +2992,7 @@ pmap_enter(pmap_t pm, vaddr_t va, paddr_
oflags = pv-pv_flags;
#ifdef PMAP_CACHE_VIVT
- if (!(oflags PVF_NC) == 0 l2pte_valid(opte)) {
+ if (!(oflags PVF_NC) l2pte_valid(opte)) {
pmap_cache_wbinv_page(pm, va, true, oflags);
}
#endif
@@ -3624,7 +3624,8 @@ pmap_protect(pmap_t pm, vaddr_t sva, vad
* write-protect operation. If the pmap is
* active, write-back the page.
*/
-pmap_cache_wbinv_page(pm, sva, false, PVF_REF);
+pmap_cache_wbinv_page(pm, sva, false,
+PVF_REF | PVF_WRITE);
#endif
pg = PHYS_TO_VM_PAGE(l2pte_pa(pte));
CVS commit: src/sys/arch/arm/cortex
Module Name:src
Committed By: matt
Date: Thu Sep 12 15:38:04 UTC 2013
Modified Files:
src/sys/arch/arm/cortex: gtmr.c gtmr_var.h
Log Message:
Cleanup some diagnostic code.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/cortex/gtmr.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/cortex/gtmr_var.h
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/arm/cortex/gtmr.c
diff -u src/sys/arch/arm/cortex/gtmr.c:1.3 src/sys/arch/arm/cortex/gtmr.c:1.4
--- src/sys/arch/arm/cortex/gtmr.c:1.3 Sat Sep 7 01:42:44 2013
+++ src/sys/arch/arm/cortex/gtmr.c Thu Sep 12 15:38:04 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: gtmr.c,v 1.3 2013/09/07 01:42:44 matt Exp $ */
+/* $NetBSD: gtmr.c,v 1.4 2013/09/12 15:38:04 matt Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,13 +30,14 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: gtmr.c,v 1.3 2013/09/07 01:42:44 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: gtmr.c,v 1.4 2013/09/12 15:38:04 matt Exp $);
#include sys/param.h
#include sys/bus.h
#include sys/device.h
#include sys/intr.h
#include sys/kernel.h
+#include sys/percpu.h
#include sys/proc.h
#include sys/systm.h
#include sys/timetc.h
@@ -56,6 +57,10 @@ static u_int gtmr_get_timecount(struct t
static struct gtmr_softc gtmr_sc;
+struct gtmr_percpu {
+ uint32_t pc_delta;
+};
+
static struct timecounter gtmr_timecounter = {
.tc_get_timecount = gtmr_get_timecount,
.tc_poll_pps = 0,
@@ -109,10 +114,13 @@ gtmr_attach(device_t parent, device_t se
*/
armreg_cntk_ctl_write(armreg_cntk_ctl_read() | ARM_CNTKCTL_PL0VCTEN);
-
self-dv_private = sc;
sc-sc_dev = self;
+#ifdef DIAGNOSTIC
+ sc-sc_percpu = percpu_alloc(sizeof(struct gtmr_percpu));
+#endif
+
evcnt_attach_dynamic(sc-sc_ev_missing_ticks, EVCNT_TYPE_MISC, NULL,
device_xname(self), missing interrupts);
@@ -120,8 +128,17 @@ gtmr_attach(device_t parent, device_t se
IST_EDGE, clockhandler, NULL);
if (sc-sc_global_ih == NULL)
panic(%s: unable to register timer interrupt, __func__);
- aprint_normal_dev(sc-sc_dev, interrupting on irq %d\n,
+ aprint_normal_dev(self, interrupting on irq %d\n,
IRQ_GTMR_PPI_VTIMER);
+
+ const uint32_t cnt_frq = armreg_cnt_frq_read();
+ if (cnt_frq == 0) {
+ aprint_verbose_dev(self, cp15 CNT_FRQ not set\n);
+ } else if (cnt_frq != sc-sc_freq) {
+ aprint_verbose_dev(self,
+ cp15 CNT_FRQ (%u) differs from supplied frequency\n,
+ cnt_frq);
+ }
}
void
@@ -185,7 +202,7 @@ void
cpu_initclocks(void)
{
struct gtmr_softc * const sc = gtmr_sc;
-
+
KASSERT(sc-sc_dev != NULL);
KASSERT(sc-sc_freq != 0);
@@ -206,7 +223,7 @@ gtmr_delay(unsigned int n)
KASSERT(sc != NULL);
- uint32_t freq = sc-sc_freq ? sc-sc_freq : curcpu()-ci_data.cpu_cc_freq / 2;
+ uint32_t freq = sc-sc_freq ? sc-sc_freq : armreg_cnt_frq_read();
KASSERT(freq != 0);
/*
@@ -232,18 +249,18 @@ gtmr_delay(unsigned int n)
static int
clockhandler(void *arg)
{
- struct clockframe * const cf = arg;
- struct gtmr_softc * const sc = gtmr_sc;
- struct cpu_info * const ci = curcpu();
-
const uint64_t now = armreg_cntv_ct_read();
+ struct cpu_info * const ci = curcpu();
uint64_t delta = now - ci-ci_lastintr;
+ struct clockframe * const cf = arg;
+ struct gtmr_softc * const sc = gtmr_sc;
#ifdef DIAGNOSTIC
const uint64_t then = armreg_cntv_cval_read();
+ struct gtmr_percpu * const pc = percpu_getref(sc-sc_percpu);
KASSERTMSG(then = now, %PRId64, now - then);
- KASSERTMSG(then - ci-ci_lastintr = sc-sc_autoinc, %PRId64,
- then - ci-ci_lastintr - sc-sc_autoinc);
+ KASSERTMSG(then + pc-pc_delta = ci-ci_lastintr + sc-sc_autoinc,
+ %PRId64, then + pc-pc_delta - ci-ci_lastintr - sc-sc_autoinc);
#endif
#if 0
@@ -255,7 +272,7 @@ clockhandler(void *arg)
ci-ci_data.cpu_name, delta, sc-sc_autoinc);
/*
- * If we got interrutped too soon (delta sc-sc_autoinc) or
+ * If we got interrupted too soon (delta sc-sc_autoinc) or
* we missed a tick (delta = 2 * sc-sc_autoinc), don't try to
* adjust for jitter.
*/
@@ -265,12 +282,17 @@ clockhandler(void *arg)
}
armreg_cntv_tval_write(sc-sc_autoinc - delta);
- ci-ci_lastintr = now - delta;
+ ci-ci_lastintr = now;
+
+#ifdef DIAGNOSTIC
+ KASSERT(delta == (uint32_t) delta);
+ pc-pc_delta = delta;
+ percpu_putref(sc-sc_percpu);
+#endif
hardclock(cf);
- if (delta 2 * sc-sc_autoinc)
- sc-sc_ev_missing_ticks.ev_count += (delta / sc-sc_autoinc) - 1;
+ sc-sc_ev_missing_ticks.ev_count += delta / sc-sc_autoinc;
return 1;
}
Index: src/sys/arch/arm/cortex/gtmr_var.h
diff -u src/sys/arch/arm/cortex/gtmr_var.h:1.2 src/sys/arch/arm/cortex/gtmr_var.h:1.3
--- src/sys/arch/arm/cortex/gtmr_var.h:1.2 Thu Jun 20 05:30:21 2013
+++ src/sys/arch/arm/cortex/gtmr_var.h Thu Sep 12 15:38:04 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: gtmr_var.h,v 1.2 2013/06/20 05:30:21 matt Exp $ */
+/* $NetBSD:
CVS commit: src/lib/libc/stdlib
Module Name:src Committed By: joerg Date: Thu Sep 12 15:35:16 UTC 2013 Modified Files: src/lib/libc/stdlib: jemalloc.c Log Message: NetBSD certainly supports TLS in static applications if it supports TLS on the platform at all. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/lib/libc/stdlib/jemalloc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/stdlib/jemalloc.c diff -u src/lib/libc/stdlib/jemalloc.c:1.28 src/lib/libc/stdlib/jemalloc.c:1.29 --- src/lib/libc/stdlib/jemalloc.c:1.28 Wed Mar 21 14:32:22 2012 +++ src/lib/libc/stdlib/jemalloc.c Thu Sep 12 15:35:15 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: jemalloc.c,v 1.28 2012/03/21 14:32:22 christos Exp $ */ +/* $NetBSD: jemalloc.c,v 1.29 2013/09/12 15:35:15 joerg Exp $ */ /*- * Copyright (C) 2006,2007 Jason Evans jas...@freebsd.org. @@ -118,7 +118,7 @@ #include sys/cdefs.h /* __FBSDID($FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.147 2007/06/15 22:00:16 jasone Exp $); */ -__RCSID($NetBSD: jemalloc.c,v 1.28 2012/03/21 14:32:22 christos Exp $); +__RCSID($NetBSD: jemalloc.c,v 1.29 2013/09/12 15:35:15 joerg Exp $); #ifdef __FreeBSD__ #include libc_private.h @@ -288,11 +288,6 @@ __strerror_r(int e, char *s, size_t l) # define SIZEOF_INT_2POW 2 #endif -/* We can't use TLS in non-PIC programs, since TLS relies on loader magic. */ -#if (!defined(PIC) !defined(NO_TLS)) -# define NO_TLS -#endif - /* * Size and alignment of memory chunks that are allocated by the OS's virtual * memory system.
CVS commit: src/sys/nfs
Module Name:src Committed By: drochner Date: Thu Sep 12 18:00:18 UTC 2013 Modified Files: src/sys/nfs: nfs_bootparam.c Log Message: tyop in comment, from Eivind Evensen via OpenBSD To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/sys/nfs/nfs_bootparam.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/nfs/nfs_bootparam.c diff -u src/sys/nfs/nfs_bootparam.c:1.37 src/sys/nfs/nfs_bootparam.c:1.38 --- src/sys/nfs/nfs_bootparam.c:1.37 Sun Mar 21 00:10:40 2010 +++ src/sys/nfs/nfs_bootparam.c Thu Sep 12 18:00:18 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: nfs_bootparam.c,v 1.37 2010/03/21 00:10:40 chs Exp $ */ +/* $NetBSD: nfs_bootparam.c,v 1.38 2013/09/12 18:00:18 drochner Exp $ */ /*- * Copyright (c) 1995, 1997 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: nfs_bootparam.c,v 1.37 2010/03/21 00:10:40 chs Exp $); +__KERNEL_RCSID(0, $NetBSD: nfs_bootparam.c,v 1.38 2013/09/12 18:00:18 drochner Exp $); #ifdef _KERNEL_OPT #include opt_nfs_boot.h @@ -101,7 +101,7 @@ static int bp_getfile (struct sockaddr_i * Use the old broadcast address for the WHOAMI * call because we do not yet know our netmask. * The server address returned by the WHOAMI call - * is used for all subsequent booptaram RPCs. + * is used for all subsequent bootparam RPCs. */ int nfs_bootparam(struct nfs_diskless *nd, struct lwp *lwp, int *flags)
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Thu Sep 12 19:37:19 UTC 2013
Modified Files:
src/sys/dev/pci: cz.c
Log Message:
Eliminate an unused variable - someone with docs and test hardware please
check the XXX introduced.
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/dev/pci/cz.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/dev/pci/cz.c
diff -u src/sys/dev/pci/cz.c:1.56 src/sys/dev/pci/cz.c:1.57
--- src/sys/dev/pci/cz.c:1.56 Sat Oct 27 17:18:31 2012
+++ src/sys/dev/pci/cz.c Thu Sep 12 19:37:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cz.c,v 1.56 2012/10/27 17:18:31 chs Exp $ */
+/* $NetBSD: cz.c,v 1.57 2013/09/12 19:37:19 martin Exp $ */
/*-
* Copyright (c) 2000 Zembu Labs, Inc.
@@ -73,7 +73,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cz.c,v 1.56 2012/10/27 17:18:31 chs Exp $);
+__KERNEL_RCSID(0, $NetBSD: cz.c,v 1.57 2013/09/12 19:37:19 martin Exp $);
#include sys/param.h
#include sys/systm.h
@@ -685,7 +685,7 @@ static int
cz_intr(void *arg)
{
int rval = 0;
- u_int command, channel, param;
+ u_int command, channel;
struct cz_softc *cz = arg;
struct cztty_softc *sc;
struct tty *tp;
@@ -693,7 +693,8 @@ cz_intr(void *arg)
while ((command = (CZ_PLX_READ(cz, PLX_LOCAL_PCI_DOORBELL) 0xff))) {
rval = 1;
channel = CZ_FWCTL_READ(cz, BRDCTL_FWCMD_CHANNEL);
- param = CZ_FWCTL_READ(cz, BRDCTL_FWCMD_PARAM);
+ /* XXX - is this needed? */
+ (void)CZ_FWCTL_READ(cz, BRDCTL_FWCMD_PARAM);
/* now clear this interrupt, posslibly enabling another */
CZ_PLX_WRITE(cz, PLX_LOCAL_PCI_DOORBELL, command);
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src
Committed By: martin
Date: Thu Sep 12 19:38:59 UTC 2013
Modified Files:
src/sys/arch/sparc64/sparc64: db_interface.c
Log Message:
Remove unused variable
To generate a diff of this commit:
cvs rdiff -u -r1.131 -r1.132 src/sys/arch/sparc64/sparc64/db_interface.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/sparc64/sparc64/db_interface.c
diff -u src/sys/arch/sparc64/sparc64/db_interface.c:1.131 src/sys/arch/sparc64/sparc64/db_interface.c:1.132
--- src/sys/arch/sparc64/sparc64/db_interface.c:1.131 Thu Jan 3 07:51:48 2013
+++ src/sys/arch/sparc64/sparc64/db_interface.c Thu Sep 12 19:38:59 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.131 2013/01/03 07:51:48 martin Exp $ */
+/* $NetBSD: db_interface.c,v 1.132 2013/09/12 19:38:59 martin Exp $ */
/*
* Copyright (c) 1996-2002 Eduardo Horvath. All rights reserved.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: db_interface.c,v 1.131 2013/01/03 07:51:48 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: db_interface.c,v 1.132 2013/09/12 19:38:59 martin Exp $);
#ifdef _KERNEL_OPT
#include opt_ddb.h
@@ -487,10 +487,9 @@ void
db_dump_pmap(struct pmap *pm)
{
/* print all valid pages in the kernel pmap */
- unsigned long long i, j, k, n, data0, data1;
+ unsigned long long i, j, k, data0, data1;
paddr_t *pdir, *ptbl;
- n = 0;
for (i = 0; i STSZ; i++) {
pdir = (paddr_t *)(u_long)ldxa((vaddr_t)pm-pm_segs[i], ASI_PHYS_CACHED);
if (!pdir) {
@@ -787,7 +786,7 @@ db_dump_pcb(db_expr_t addr, bool have_ad
void
db_setpcb(db_expr_t addr, bool have_addr, db_expr_t count, const char *modif)
{
- struct proc *p, *pp;
+ struct proc *p;
int ctx;
if (!have_addr) {
@@ -796,7 +795,6 @@ db_setpcb(db_expr_t addr, bool have_addr
}
LIST_FOREACH(p, allproc, p_list) {
- pp = p-p_pptr;
if (p-p_stat p-p_pid == addr) {
if (p-p_vmspace-vm_map.pmap == pmap_kernel()) {
db_printf(PID %ld has a kernel context.\n,
CVS commit: src/sys/dev/i2c
Module Name:src
Committed By: martin
Date: Thu Sep 12 19:46:31 UTC 2013
Modified Files:
src/sys/dev/i2c: dbcool.c
Log Message:
Remove unused variables
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/dev/i2c/dbcool.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/dev/i2c/dbcool.c
diff -u src/sys/dev/i2c/dbcool.c:1.38 src/sys/dev/i2c/dbcool.c:1.39
--- src/sys/dev/i2c/dbcool.c:1.38 Sat Jun 2 21:36:44 2012
+++ src/sys/dev/i2c/dbcool.c Thu Sep 12 19:46:31 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dbcool.c,v 1.38 2012/06/02 21:36:44 dsl Exp $ */
+/* $NetBSD: dbcool.c,v 1.39 2013/09/12 19:46:31 martin Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dbcool.c,v 1.38 2012/06/02 21:36:44 dsl Exp $);
+__KERNEL_RCSID(0, $NetBSD: dbcool.c,v 1.39 2013/09/12 19:46:31 martin Exp $);
#include sys/param.h
#include sys/systm.h
@@ -836,21 +836,20 @@ bool dbcool_pmf_suspend(device_t dev, co
return true;
}
-/* On resume, we restore the previous state of the SHDN bit */
+/* On resume, we restore the previous state of the SHDN bit (which
+ we saved in sc_suspend) */
bool dbcool_pmf_resume(device_t dev, const pmf_qual_t *qual)
{
struct dbcool_softc *sc = device_private(dev);
- uint8_t reg, bit, cfg;
+ uint8_t reg, cfg;
if ((sc-sc_dc.dc_chip-flags DBCFLAG_HAS_SHDN) == 0)
return true;
if (sc-sc_dc.dc_chip-flags DBCFLAG_ADT7466) {
reg = DBCOOL_ADT7466_CONFIG2;
- bit = DBCOOL_ADT7466_CFG2_SHDN;
} else {
reg = DBCOOL_CONFIG2_REG;
- bit = DBCOOL_CFG2_SHDN;
}
cfg = sc-sc_dc.dc_readreg(sc-sc_dc, reg);
cfg = ~sc-sc_suspend;
@@ -1752,7 +1751,7 @@ dbcool_attach_temp_control(struct dbcool
static void
dbcool_setup_controllers(struct dbcool_softc *sc)
{
- int i, j, ret, rw_flag;
+ int i, j, rw_flag;
uint8_t sysctl_reg;
struct chip_id *chip = sc-sc_dc.dc_chip;
const struct sysctlnode *me2 = NULL;
@@ -1761,7 +1760,7 @@ dbcool_setup_controllers(struct dbcool_s
for (i = 0; chip-power[i].desc != NULL; i++) {
snprintf(name, sizeof(name), fan_ctl_%d, i);
- ret = sysctl_createv(sc-sc_sysctl_log, 0, NULL, me2,
+ sysctl_createv(sc-sc_sysctl_log, 0, NULL, me2,
CTLFLAG_READWRITE | CTLFLAG_OWNDESC,
CTLTYPE_NODE, name, NULL,
NULL, 0, NULL, 0,
@@ -1779,7 +1778,7 @@ dbcool_setup_controllers(struct dbcool_s
rw_flag = CTLFLAG_READONLY | CTLFLAG_OWNDESC;
else
rw_flag = CTLFLAG_READWRITE | CTLFLAG_OWNDESC;
- ret = (sysctl_createv)(sc-sc_sysctl_log, 0, NULL,
+ (sysctl_createv)(sc-sc_sysctl_log, 0, NULL,
node, rw_flag,
(j == DBC_PWM_BEHAVIOR)?
CTLTYPE_STRING:CTLTYPE_INT,
CVS commit: src/sys/dev/i2c
Module Name:src Committed By: martin Date: Thu Sep 12 20:30:58 UTC 2013 Modified Files: src/sys/dev/i2c: i2c_exec.c Log Message: Fix evil sizeof(void*) botch To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/dev/i2c/i2c_exec.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/dev/i2c/i2c_exec.c diff -u src/sys/dev/i2c/i2c_exec.c:1.8 src/sys/dev/i2c/i2c_exec.c:1.9 --- src/sys/dev/i2c/i2c_exec.c:1.8 Sun Apr 22 14:10:36 2012 +++ src/sys/dev/i2c/i2c_exec.c Thu Sep 12 20:30:58 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: i2c_exec.c,v 1.8 2012/04/22 14:10:36 pgoyette Exp $ */ +/* $NetBSD: i2c_exec.c,v 1.9 2013/09/12 20:30:58 martin Exp $ */ /* * Copyright (c) 2003 Wasabi Systems, Inc. @@ -36,7 +36,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: i2c_exec.c,v 1.8 2012/04/22 14:10:36 pgoyette Exp $); +__KERNEL_RCSID(0, $NetBSD: i2c_exec.c,v 1.9 2013/09/12 20:30:58 martin Exp $); #include sys/param.h #include sys/systm.h @@ -90,8 +90,9 @@ iic_exec(i2c_tag_t tag, i2c_op_t op, i2c case 2: break; default: - memcpy(data, vbuf, sizeof(vbuf)); - data[sizeof(vbuf)] = iic_smbus_pec(2, b, data); + KASSERT(buflen+1 sizeof(data)); + memcpy(data, vbuf, buflen); + data[buflen] = iic_smbus_pec(2, b, data); buflen++; break; }
CVS commit: src/sys/external/bsd/ipf/netinet
Module Name:src
Committed By: martin
Date: Thu Sep 12 20:03:10 UTC 2013
Modified Files:
src/sys/external/bsd/ipf/netinet: fil.c
Log Message:
Remove unused variable
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/ipf/netinet/fil.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/external/bsd/ipf/netinet/fil.c
diff -u src/sys/external/bsd/ipf/netinet/fil.c:1.10 src/sys/external/bsd/ipf/netinet/fil.c:1.11
--- src/sys/external/bsd/ipf/netinet/fil.c:1.10 Fri Aug 30 15:00:08 2013
+++ src/sys/external/bsd/ipf/netinet/fil.c Thu Sep 12 20:03:10 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: fil.c,v 1.10 2013/08/30 15:00:08 rmind Exp $ */
+/* $NetBSD: fil.c,v 1.11 2013/09/12 20:03:10 martin Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -138,7 +138,7 @@ extern struct timeout ipf_slowtimer_ch;
#if !defined(lint)
#if defined(__NetBSD__)
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: fil.c,v 1.10 2013/08/30 15:00:08 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: fil.c,v 1.11 2013/09/12 20:03:10 martin Exp $);
#else
static const char sccsid[] = @(#)fil.c 1.36 6/5/96 (C) 1993-2000 Darren Reed;
static const char rcsid[] = @(#)Id: fil.c,v 1.1.1.2 2012/07/22 13:45:07 darrenr Exp $;
@@ -4330,13 +4330,12 @@ frrequest(ipf_main_softc_t *softc, int u
{
int error = 0, in, family, addrem, need_free = 0;
frentry_t frd, *fp, *f, **fprev, **ftail;
- void *ptr, *uptr, *cptr;
+ void *ptr, *uptr;
u_int *p, *pp;
frgroup_t *fg;
char *group;
ptr = NULL;
- cptr = NULL;
fg = NULL;
fp = frd;
if (makecopy != 0) {
@@ -4446,7 +4445,6 @@ frrequest(ipf_main_softc_t *softc, int u
}
ptr = NULL;
- cptr = NULL;
if (FR_ISACCOUNT(fp-fr_flags))
unit = IPL_LOGCOUNT;
CVS commit: src/sys/net80211
Module Name:src Committed By: martin Date: Thu Sep 12 20:44:02 UTC 2013 Modified Files: src/sys/net80211: ieee80211_ioctl.c Log Message: Fix return value of ieee80211_ioctl_setoptie To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/sys/net80211/ieee80211_ioctl.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/net80211/ieee80211_ioctl.c diff -u src/sys/net80211/ieee80211_ioctl.c:1.57 src/sys/net80211/ieee80211_ioctl.c:1.58 --- src/sys/net80211/ieee80211_ioctl.c:1.57 Sat Dec 31 20:41:58 2011 +++ src/sys/net80211/ieee80211_ioctl.c Thu Sep 12 20:44:02 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: ieee80211_ioctl.c,v 1.57 2011/12/31 20:41:58 christos Exp $ */ +/* $NetBSD: ieee80211_ioctl.c,v 1.58 2013/09/12 20:44:02 martin Exp $ */ /*- * Copyright (c) 2001 Atsushi Onoe * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting @@ -36,7 +36,7 @@ __FBSDID($FreeBSD: src/sys/net80211/ieee80211_ioctl.c,v 1.35 2005/08/30 14:27:47 avatar Exp $); #endif #ifdef __NetBSD__ -__KERNEL_RCSID(0, $NetBSD: ieee80211_ioctl.c,v 1.57 2011/12/31 20:41:58 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: ieee80211_ioctl.c,v 1.58 2013/09/12 20:44:02 martin Exp $); #endif /* @@ -1615,7 +1615,7 @@ ieee80211_ioctl_setoptie(struct ieee8021 free(ic-ic_opt_ie, M_DEVBUF); ic-ic_opt_ie = ie; ic-ic_opt_ie_len = ireq-i_len; - return 0; + return error; } static int
CVS commit: src
Module Name:src
Committed By: joerg
Date: Thu Sep 12 17:14:20 UTC 2013
Modified Files:
src/external/bsd/atf/lib/libatf-c++: Makefile
src/external/bsd/kyua-cli/lib: Makefile.inc
src/external/bsd/lutok/lib/liblutok: Makefile
src/external/mit/xorg/bin/glxinfo: Makefile
src/external/mit/xorg/lib/libGLU: Makefile
src/share/mk: bsd.lib.mk
src/x11/bin/glxinfo: Makefile
src/x11/lib/GLU: Makefile
Log Message:
Handle dependency on libstdc++ / libc++ in bsd.lib.mk.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/external/bsd/atf/lib/libatf-c++/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/kyua-cli/lib/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/lutok/lib/liblutok/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/glxinfo/Makefile
cvs rdiff -u -r1.11 -r1.12 src/external/mit/xorg/lib/libGLU/Makefile
cvs rdiff -u -r1.338 -r1.339 src/share/mk/bsd.lib.mk
cvs rdiff -u -r1.3 -r1.4 src/x11/bin/glxinfo/Makefile
cvs rdiff -u -r1.9 -r1.10 src/x11/lib/GLU/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/lib/libatf-c++/Makefile
diff -u src/external/bsd/atf/lib/libatf-c++/Makefile:1.19 src/external/bsd/atf/lib/libatf-c++/Makefile:1.20
--- src/external/bsd/atf/lib/libatf-c++/Makefile:1.19 Thu Mar 14 07:10:06 2013
+++ src/external/bsd/atf/lib/libatf-c++/Makefile Thu Sep 12 17:14:20 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2013/03/14 07:10:06 jmmv Exp $
+# $NetBSD: Makefile,v 1.20 2013/09/12 17:14:20 joerg Exp $
NOLINT= # defined
@@ -8,11 +8,6 @@ LIB= atf-c++
LIBISCXX= yes
LIBDPLIBS+= atf-c ${.CURDIR}/../libatf-c
-.if ${HAVE_GCC} == 4
-LIBDPLIBS+= stdc++ ${.CURDIR}/../../../../../gnu/lib/libstdc++-v3_4
-.else
-LIBDPLIBS+= stdc++ ${.CURDIR}/../../../../../external/gpl3/gcc/lib/libstdc++-v3
-.endif
LIBDPLIBS+= m ${.CURDIR}/../../../../../lib/libm
Index: src/external/bsd/kyua-cli/lib/Makefile.inc
diff -u src/external/bsd/kyua-cli/lib/Makefile.inc:1.1 src/external/bsd/kyua-cli/lib/Makefile.inc:1.2
--- src/external/bsd/kyua-cli/lib/Makefile.inc:1.1 Sat Feb 23 14:16:49 2013
+++ src/external/bsd/kyua-cli/lib/Makefile.inc Thu Sep 12 17:14:20 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1 2013/02/23 14:16:49 jmmv Exp $
+# $NetBSD: Makefile.inc,v 1.2 2013/09/12 17:14:20 joerg Exp $
.include ../Makefile.inc
@@ -6,9 +6,4 @@ LIBISCXX= yes
LIBISPRIVATE= yes
LIBDPLIBS+= lua ${.CURDIR}/../../../../mit/lua/lib/liblua
-.if ${HAVE_GCC} == 4
-LIBDPLIBS+= stdc++ ${.CURDIR}/../../../../../gnu/lib/libstdc++-v3_4
-.else
-LIBDPLIBS+= stdc++ ${.CURDIR}/../../../../../external/gpl3/gcc/lib/libstdc++-v3
-.endif
LIBDPLIBS+= m ${.CURDIR}/../../../../../lib/libm
Index: src/external/bsd/lutok/lib/liblutok/Makefile
diff -u src/external/bsd/lutok/lib/liblutok/Makefile:1.2 src/external/bsd/lutok/lib/liblutok/Makefile:1.3
--- src/external/bsd/lutok/lib/liblutok/Makefile:1.2 Fri Feb 22 15:14:31 2013
+++ src/external/bsd/lutok/lib/liblutok/Makefile Thu Sep 12 17:14:20 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/02/22 15:14:31 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2013/09/12 17:14:20 joerg Exp $
#NOLINT= # defined
@@ -8,11 +8,6 @@ LIB= lutok
LIBISCXX= yes
LIBDPLIBS+= lua ${.CURDIR}/../../../../mit/lua/lib/liblua
-.if ${HAVE_GCC} == 4
-LIBDPLIBS+= stdc++ ${.CURDIR}/../../../../../gnu/lib/libstdc++-v3_4
-.else
-LIBDPLIBS+= stdc++ ${.CURDIR}/../../../../../external/gpl3/gcc/lib/libstdc++-v3
-.endif
LIBDPLIBS+= m ${.CURDIR}/../../../../../lib/libm
SRCDIR= ${NETBSDSRCDIR}/external/bsd/lutok/dist
Index: src/external/mit/xorg/bin/glxinfo/Makefile
diff -u src/external/mit/xorg/bin/glxinfo/Makefile:1.2 src/external/mit/xorg/bin/glxinfo/Makefile:1.3
--- src/external/mit/xorg/bin/glxinfo/Makefile:1.2 Sun Sep 7 14:07:21 2008
+++ src/external/mit/xorg/bin/glxinfo/Makefile Thu Sep 12 17:14:20 2013
@@ -1,16 +1,19 @@
-# $NetBSD: Makefile,v 1.2 2008/09/07 14:07:21 lukem Exp $
+# $NetBSD: Makefile,v 1.3 2013/09/12 17:14:20 joerg Exp $
NOMAN= # defined
.include bsd.own.mk
-PROG= glxinfo
+.if ${MKPIC} == no || ${LDSTATIC:U} !=
+PROG_CXX= glxinfo
+.else
+PROG= glxinfo
+.endif
CPPFLAGS+=${X11FLAGS.THREADS} -DDO_GLU
-LDADD+= -lGLU -lGL -lXext -lX11 -lpthread -lstdc++ -lm
-DPADD+= ${LIBGLU} ${LIBGL} ${LIBXEXT} ${LIBX11} ${LIBPTHREAD}
-DPADD+= ${LIBSTDCXX} ${LIBM}
+LDADD+= -lGLU -lGL -lXext -lX11 -lpthread -lm
+DPADD+= ${LIBGLU} ${LIBGL} ${LIBXEXT} ${LIBX11} ${LIBPTHREAD} ${LIBM}
.PATH: ${X11SRCDIR.MesaDemos}/progs/xdemos
Index: src/external/mit/xorg/lib/libGLU/Makefile
diff -u src/external/mit/xorg/lib/libGLU/Makefile:1.11 src/external/mit/xorg/lib/libGLU/Makefile:1.12
--- src/external/mit/xorg/lib/libGLU/Makefile:1.11 Fri May 24 17:18:12 2013
+++ src/external/mit/xorg/lib/libGLU/Makefile Thu Sep 12 17:14:20 2013
@@
CVS commit: src/sys/kern
Module Name:src
Committed By: christos
Date: Thu Sep 12 19:01:38 UTC 2013
Modified Files:
src/sys/kern: kern_exec.c
Log Message:
What's the point of having a module exec class if exec is not using it?
To generate a diff of this commit:
cvs rdiff -u -r1.362 -r1.363 src/sys/kern/kern_exec.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/kern/kern_exec.c
diff -u src/sys/kern/kern_exec.c:1.362 src/sys/kern/kern_exec.c:1.363
--- src/sys/kern/kern_exec.c:1.362 Tue Sep 10 17:30:21 2013
+++ src/sys/kern/kern_exec.c Thu Sep 12 15:01:38 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_exec.c,v 1.362 2013/09/10 21:30:21 matt Exp $ */
+/* $NetBSD: kern_exec.c,v 1.363 2013/09/12 19:01:38 christos Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_exec.c,v 1.362 2013/09/10 21:30:21 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_exec.c,v 1.363 2013/09/12 19:01:38 christos Exp $);
#include opt_exec.h
#include opt_execfmt.h
@@ -557,7 +557,7 @@ exec_autoload(void)
list = (nexecs == 0 ? native : compat);
for (i = 0; list[i] != NULL; i++) {
- if (module_autoload(list[i], MODULE_CLASS_MISC) != 0) {
+ if (module_autoload(list[i], MODULE_CLASS_EXEC) != 0) {
continue;
}
yield();
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: martin
Date: Thu Sep 12 20:40:46 UTC 2013
Modified Files:
src/sys/dev/ic: i82557.c
Log Message:
Remove unused variable
To generate a diff of this commit:
cvs rdiff -u -r1.140 -r1.141 src/sys/dev/ic/i82557.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/dev/ic/i82557.c
diff -u src/sys/dev/ic/i82557.c:1.140 src/sys/dev/ic/i82557.c:1.141
--- src/sys/dev/ic/i82557.c:1.140 Sun Jul 22 14:32:57 2012
+++ src/sys/dev/ic/i82557.c Thu Sep 12 20:40:46 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: i82557.c,v 1.140 2012/07/22 14:32:57 matt Exp $ */
+/* $NetBSD: i82557.c,v 1.141 2013/09/12 20:40:46 martin Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999, 2001, 2002 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: i82557.c,v 1.140 2012/07/22 14:32:57 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: i82557.c,v 1.141 2013/09/12 20:40:46 martin Exp $);
#include sys/param.h
#include sys/systm.h
@@ -1217,11 +1217,9 @@ fxp_rx_hwcksum(struct fxp_softc *sc, str
csum_data = 0;
if ((sc-sc_flags FXPF_EXT_RFA) != 0) {
- uint8_t rxparsestat;
uint8_t csum_stat;
csum_stat = rfa-cksum_stat;
- rxparsestat = rfa-rx_parse_stat;
if ((rfa-rfa_status htole16(FXP_RFA_STATUS_PARSE)) == 0)
goto out;
CVS commit: src/sys/kern
Module Name:src
Committed By: christos
Date: Thu Sep 12 19:02:05 UTC 2013
Modified Files:
src/sys/kern: kern_module.c
Log Message:
Silence some common module load errors and explain why.
To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 src/sys/kern/kern_module.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/kern/kern_module.c
diff -u src/sys/kern/kern_module.c:1.91 src/sys/kern/kern_module.c:1.92
--- src/sys/kern/kern_module.c:1.91 Sun Mar 24 18:06:37 2013
+++ src/sys/kern/kern_module.c Thu Sep 12 15:02:05 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_module.c,v 1.91 2013/03/24 22:06:37 christos Exp $ */
+/* $NetBSD: kern_module.c,v 1.92 2013/09/12 19:02:05 christos Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_module.c,v 1.91 2013/03/24 22:06:37 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_module.c,v 1.92 2013/09/12 19:02:05 christos Exp $);
#define _MODULE_INTERNAL
@@ -926,8 +926,15 @@ module_do_load(const char *name, bool is
filedict);
if (error != 0) {
#ifdef DEBUG
- module_error(vfs load failed for `%s', error %d,
- name, error);
+ /*
+ * The exec class of modules contains a list of
+ * modules that is the union of all the modules
+ * available for each architecture, so we don't
+ * print an error if they are missing.
+ */
+ if (class != MODULE_CLASS_EXEC || errno != ENOENT)
+module_error(vfs load failed for `%s',
+error %d, name, error);
#endif
kmem_free(mod, sizeof(*mod));
depth--;
CVS commit: src/sys/dev/ieee1394
Module Name:src
Committed By: martin
Date: Thu Sep 12 20:16:51 UTC 2013
Modified Files:
src/sys/dev/ieee1394: fwohci.c
Log Message:
Make it compilable with gcc 4.8.1
To generate a diff of this commit:
cvs rdiff -u -r1.134 -r1.135 src/sys/dev/ieee1394/fwohci.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/dev/ieee1394/fwohci.c
diff -u src/sys/dev/ieee1394/fwohci.c:1.134 src/sys/dev/ieee1394/fwohci.c:1.135
--- src/sys/dev/ieee1394/fwohci.c:1.134 Sun Apr 7 07:42:20 2013
+++ src/sys/dev/ieee1394/fwohci.c Thu Sep 12 20:16:51 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: fwohci.c,v 1.134 2013/04/07 07:42:20 kiyohara Exp $ */
+/* $NetBSD: fwohci.c,v 1.135 2013/09/12 20:16:51 martin Exp $ */
/*-
* Copyright (c) 2003 Hidetoshi Shimokawa
@@ -37,7 +37,7 @@
*
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: fwohci.c,v 1.134 2013/04/07 07:42:20 kiyohara Exp $);
+__KERNEL_RCSID(0, $NetBSD: fwohci.c,v 1.135 2013/09/12 20:16:51 martin Exp $);
#include sys/param.h
#include sys/atomic.h
@@ -919,13 +919,10 @@ fwohci_itxbuf_enable(struct firewire_com
struct fw_xferq *it;
uint32_t stat;
int cycle_match, cycle_now, ldesc, err = 0;
- unsigned short tag, ich;
dbch = sc-it[dmach];
it = dbch-xferq;
- tag = (it-flag 6) 3;
- ich = it-flag 0x3f;
if ((dbch-flags FWOHCI_DBCH_INIT) == 0) {
dbch-ndb = it-bnpacket * it-bnchunk;
dbch-ndesc = 3;
@@ -2194,7 +2191,10 @@ fwohci_tbuf_update(struct fwohci_softc *
struct fwohcidb *db;
struct fw_bulkxfer *chunk;
struct fw_xferq *it;
- uint32_t stat, count;
+ uint32_t stat;
+#if 0
+ uint32_t count;
+#endif
int w = 0, ldesc;
it = fc-it[dmach];
@@ -2209,8 +2209,12 @@ fwohci_tbuf_update(struct fwohci_softc *
FWOHCI_DMA_READ(db[ldesc].db.desc.res) OHCI_STATUS_SHIFT;
db = ((struct fwohcidb_tr *)(chunk-start))-db;
/* timestamp */
+#if 0
count =
FWOHCI_DMA_READ(db[ldesc].db.desc.res) OHCI_COUNT_MASK;
+#else
+ (void)FWOHCI_DMA_READ(db[ldesc].db.desc.res);
+#endif
if (stat == 0)
break;
STAILQ_REMOVE_HEAD(it-stdma, link);
@@ -2344,8 +2348,12 @@ static void
dump_db(struct fwohci_softc *sc, uint32_t ch)
{
struct fwohci_dbch *dbch;
- struct fwohcidb_tr *cp = NULL, *pp, *np = NULL;
- struct fwohcidb *curr = NULL, *prev, *next = NULL;
+ struct fwohcidb_tr *cp = NULL, *pp;
+ struct fwohcidb *curr = NULL;
+#if 0
+ struct fwohcidb_tr *np = NULL;
+ struct fwohcidb *prev, *next = NULL;
+#endif
int idb, jdb;
uint32_t cmd;
@@ -2368,21 +2376,27 @@ dump_db(struct fwohci_softc *sc, uint32_
return;
}
pp = dbch-top;
+#if 0
prev = pp-db;
+#endif
for (idb = 0; idb dbch-ndb; idb++) {
cp = STAILQ_NEXT(pp, link);
if (cp == NULL) {
curr = NULL;
goto outdb;
}
+#if 0
np = STAILQ_NEXT(cp, link);
+#endif
for (jdb = 0; jdb dbch-ndesc; jdb++)
if ((cmd 0xfff0) == cp-bus_addr) {
curr = cp-db;
+#if 0
if (np != NULL)
next = np-db;
else
next = NULL;
+#endif
goto outdb;
}
pp = STAILQ_NEXT(pp, link);
@@ -2390,7 +2404,9 @@ dump_db(struct fwohci_softc *sc, uint32_
curr = NULL;
goto outdb;
}
+#if 0
prev = pp-db;
+#endif
}
outdb:
if (curr != NULL) {
@@ -2486,7 +2502,7 @@ print_db(struct fwohcidb_tr *db_tr, stru
static void
fwohci_txbufdb(struct fwohci_softc *sc, int dmach, struct fw_bulkxfer *bulkxfer)
{
- struct fwohcidb_tr *db_tr, *fdb_tr;
+ struct fwohcidb_tr *db_tr /*, *fdb_tr */;
struct fwohci_dbch *dbch;
struct fwohcidb *db;
struct fw_pkt *fp;
@@ -2500,8 +2516,8 @@ fwohci_txbufdb(struct fwohci_softc *sc,
chtag = sc-it[dmach].xferq.flag 0xff;
db_tr = (struct fwohcidb_tr *)(bulkxfer-start);
- fdb_tr = (struct fwohcidb_tr *)(bulkxfer-end);
/*
+ fdb_tr = (struct fwohcidb_tr *)(bulkxfer-end);
aprint_normal(sc-fc.dev, DB %08x %08x %08x\n, bulkxfer, db_tr-bus_addr, fdb_tr-bus_addr);
*/
for (idb = 0; idb dbch-xferq.bnpacket; idb++) {
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Thu Sep 12 21:11:37 UTC 2013
Modified Files:
src/sys/dev/pci: if_bge.c
Log Message:
Remove unused variable
To generate a diff of this commit:
cvs rdiff -u -r1.258 -r1.259 src/sys/dev/pci/if_bge.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/dev/pci/if_bge.c
diff -u src/sys/dev/pci/if_bge.c:1.258 src/sys/dev/pci/if_bge.c:1.259
--- src/sys/dev/pci/if_bge.c:1.258 Mon Jul 8 05:36:23 2013
+++ src/sys/dev/pci/if_bge.c Thu Sep 12 21:11:37 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bge.c,v 1.258 2013/07/08 05:36:23 msaitoh Exp $ */
+/* $NetBSD: if_bge.c,v 1.259 2013/09/12 21:11:37 martin Exp $ */
/*
* Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_bge.c,v 1.258 2013/07/08 05:36:23 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_bge.c,v 1.259 2013/09/12 21:11:37 martin Exp $);
#include sys/param.h
#include sys/systm.h
@@ -4575,15 +4575,14 @@ bge_intr(void *xsc)
if (sc-bge_pending_rxintr_change) {
uint32_t rx_ticks = sc-bge_rx_coal_ticks;
uint32_t rx_bds = sc-bge_rx_max_coal_bds;
- uint32_t junk;
CSR_WRITE_4(sc, BGE_HCC_RX_COAL_TICKS, rx_ticks);
DELAY(10);
- junk = CSR_READ_4(sc, BGE_HCC_RX_COAL_TICKS);
+ (void)CSR_READ_4(sc, BGE_HCC_RX_COAL_TICKS);
CSR_WRITE_4(sc, BGE_HCC_RX_MAX_COAL_BDS, rx_bds);
DELAY(10);
- junk = CSR_READ_4(sc, BGE_HCC_RX_MAX_COAL_BDS);
+ (void)CSR_READ_4(sc, BGE_HCC_RX_MAX_COAL_BDS);
sc-bge_pending_rxintr_change = 0;
}
@@ -4779,11 +4778,10 @@ static inline int
bge_compact_dma_runt(struct mbuf *pkt)
{
struct mbuf *m, *prev;
- int totlen, prevlen;
+ int totlen;
prev = NULL;
totlen = 0;
- prevlen = -1;
for (m = pkt; m != NULL; prev = m,m = m-m_next) {
int mlen = m-m_len;
@@ -4880,7 +4878,6 @@ bge_compact_dma_runt(struct mbuf *pkt)
m = n; /* for continuing loop */
}
}
- prevlen = m-m_len;
}
return 0;
}
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: martin
Date: Thu Sep 12 21:03:11 UTC 2013
Modified Files:
src/sys/dev/usb: if_axe.c
Log Message:
#ifdef some variables just like their use
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/sys/dev/usb/if_axe.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/dev/usb/if_axe.c
diff -u src/sys/dev/usb/if_axe.c:1.64 src/sys/dev/usb/if_axe.c:1.65
--- src/sys/dev/usb/if_axe.c:1.64 Tue Jan 22 12:40:42 2013
+++ src/sys/dev/usb/if_axe.c Thu Sep 12 21:03:11 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_axe.c,v 1.64 2013/01/22 12:40:42 jmcneill Exp $ */
+/* $NetBSD: if_axe.c,v 1.65 2013/09/12 21:03:11 martin Exp $ */
/* $OpenBSD: if_axe.c,v 1.96 2010/01/09 05:33:08 jsg Exp $ */
/*
@@ -89,7 +89,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_axe.c,v 1.64 2013/01/22 12:40:42 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_axe.c,v 1.65 2013/09/12 21:03:11 martin Exp $);
#ifdef _KERNEL_OPT
#include opt_inet.h
@@ -464,7 +464,9 @@ axe_reset(struct axe_softc *sc)
static void
axe_ax88178_init(struct axe_softc *sc)
{
+#ifdef AXE_DEBUG
int gpio0 = 0, phymode = 0;
+#endif
uint16_t eeprom;
axe_cmd(sc, AXE_CMD_SROM_WR_ENABLE, 0, 0, NULL);
@@ -477,6 +479,7 @@ axe_ax88178_init(struct axe_softc *sc)
DPRINTF(( EEPROM is 0x%x\n, eeprom));
/* if EEPROM is invalid we have to use to GPIO0 */
+#ifdef AXE_DEBUG
if (eeprom == 0x) {
phymode = 0;
gpio0 = 1;
@@ -484,6 +487,7 @@ axe_ax88178_init(struct axe_softc *sc)
phymode = eeprom 7;
gpio0 = (eeprom 0x80) ? 0 : 1;
}
+#endif
DPRINTF((use gpio0: %d, phymode %d\n, gpio0, phymode));
CVS commit: src/sys/netatalk
Module Name:src
Committed By: martin
Date: Thu Sep 12 19:47:58 UTC 2013
Modified Files:
src/sys/netatalk: ddp_output.c
Log Message:
Remove unused variable
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/netatalk/ddp_output.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/netatalk/ddp_output.c
diff -u src/sys/netatalk/ddp_output.c:1.16 src/sys/netatalk/ddp_output.c:1.17
--- src/sys/netatalk/ddp_output.c:1.16 Tue Jan 31 09:53:44 2012
+++ src/sys/netatalk/ddp_output.c Thu Sep 12 19:47:58 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ddp_output.c,v 1.16 2012/01/31 09:53:44 hauke Exp $ */
+/* $NetBSD: ddp_output.c,v 1.17 2013/09/12 19:47:58 martin Exp $ */
/*
* Copyright (c) 1990,1991 Regents of The University of Michigan.
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ddp_output.c,v 1.16 2012/01/31 09:53:44 hauke Exp $);
+__KERNEL_RCSID(0, $NetBSD: ddp_output.c,v 1.17 2013/09/12 19:47:58 martin Exp $);
#include sys/param.h
#include sys/systm.h
@@ -127,7 +127,6 @@ ddp_route(struct mbuf *m, struct route *
struct at_ifaddr *aa = NULL;
struct ifnet *ifp = NULL;
uint16_tnet;
- uint8_t node;
uint8_t loopback = 0;
if ((rt = rtcache_validate(ro)) != NULL (ifp = rt-rt_ifp) != NULL) {
@@ -135,7 +134,6 @@ ddp_route(struct mbuf *m, struct route *
uint16_t dnet = dst-sat_addr.s_net;
uint8_t dnode = dst-sat_addr.s_node;
net = satosat(rt-rt_gateway)-sat_addr.s_net;
- node = satosat(rt-rt_gateway)-sat_addr.s_node;
TAILQ_FOREACH(aa, at_ifaddr, aa_list) {
if (ntohs(net) = ntohs(aa-aa_firstnet)
CVS commit: src/sys/dev/sbus
Module Name:src
Committed By: martin
Date: Thu Sep 12 19:54:51 UTC 2013
Modified Files:
src/sys/dev/sbus: esp_sbus.c
Log Message:
Remove unused variable
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/dev/sbus/esp_sbus.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/dev/sbus/esp_sbus.c
diff -u src/sys/dev/sbus/esp_sbus.c:1.51 src/sys/dev/sbus/esp_sbus.c:1.52
--- src/sys/dev/sbus/esp_sbus.c:1.51 Thu Sep 17 16:28:12 2009
+++ src/sys/dev/sbus/esp_sbus.c Thu Sep 12 19:54:51 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: esp_sbus.c,v 1.51 2009/09/17 16:28:12 tsutsui Exp $ */
+/* $NetBSD: esp_sbus.c,v 1.52 2013/09/12 19:54:51 martin Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: esp_sbus.c,v 1.51 2009/09/17 16:28:12 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: esp_sbus.c,v 1.52 2013/09/12 19:54:51 martin Exp $);
#include sys/param.h
#include sys/systm.h
@@ -408,7 +408,6 @@ void
espattach(struct esp_softc *esc, struct ncr53c9x_glue *gluep)
{
struct ncr53c9x_softc *sc = esc-sc_ncr53c9x;
- void *icookie;
unsigned int uid = 0;
/*
@@ -512,7 +511,7 @@ espattach(struct esp_softc *esc, struct
}
/* Establish interrupt channel */
- icookie = bus_intr_establish(esc-sc_bustag, esc-sc_pri, IPL_BIO,
+ bus_intr_establish(esc-sc_bustag, esc-sc_pri, IPL_BIO,
ncr53c9x_intr, sc);
/* register interrupt stats */
CVS commit: src/sys/ufs/ffs
Module Name:src Committed By: martin Date: Thu Sep 12 20:00:15 UTC 2013 Modified Files: src/sys/ufs/ffs: ffs_alloc.c Log Message: #ifdef a variable just like their use To generate a diff of this commit: cvs rdiff -u -r1.138 -r1.139 src/sys/ufs/ffs/ffs_alloc.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/ufs/ffs/ffs_alloc.c diff -u src/sys/ufs/ffs/ffs_alloc.c:1.138 src/sys/ufs/ffs/ffs_alloc.c:1.139 --- src/sys/ufs/ffs/ffs_alloc.c:1.138 Sun Jun 23 22:03:34 2013 +++ src/sys/ufs/ffs/ffs_alloc.c Thu Sep 12 20:00:15 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: ffs_alloc.c,v 1.138 2013/06/23 22:03:34 dholland Exp $ */ +/* $NetBSD: ffs_alloc.c,v 1.139 2013/09/12 20:00:15 martin Exp $ */ /*- * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc. @@ -70,7 +70,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ffs_alloc.c,v 1.138 2013/06/23 22:03:34 dholland Exp $); +__KERNEL_RCSID(0, $NetBSD: ffs_alloc.c,v 1.139 2013/09/12 20:00:15 martin Exp $); #if defined(_KERNEL_OPT) #include opt_ffs.h @@ -1630,11 +1630,16 @@ ffs_discardcb(struct work *wk, void *arg struct discarddata *ts = arg; struct fs *fs = ts-fs; struct disk_discard_range ta; +#ifdef TRIMDEBUG int error; +#endif ta.bno = FFS_FSBTODB(fs, td-bno); ta.size = td-size DEV_BSHIFT; - error = VOP_IOCTL(td-devvp, DIOCDISCARD, ta, FWRITE, FSCRED); +#ifdef TRIMDEBUG + error = +#endif + VOP_IOCTL(td-devvp, DIOCDISCARD, ta, FWRITE, FSCRED); #ifdef TRIMDEBUG printf(trim(% PRId64 ,%ld):%d\n, td-bno, td-size, error); #endif
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: martin
Date: Thu Sep 12 19:53:41 UTC 2013
Modified Files:
src/sys/dev/usb: ehci.c
Log Message:
Remove unused variables
To generate a diff of this commit:
cvs rdiff -u -r1.211 -r1.212 src/sys/dev/usb/ehci.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/dev/usb/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.211 src/sys/dev/usb/ehci.c:1.212
--- src/sys/dev/usb/ehci.c:1.211 Sat Sep 7 19:53:24 2013
+++ src/sys/dev/usb/ehci.c Thu Sep 12 19:53:41 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci.c,v 1.211 2013/09/07 19:53:24 matt Exp $ */
+/* $NetBSD: ehci.c,v 1.212 2013/09/12 19:53:41 martin Exp $ */
/*
* Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ehci.c,v 1.211 2013/09/07 19:53:24 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: ehci.c,v 1.212 2013/09/12 19:53:41 martin Exp $);
#include ohci.h
#include uhci.h
@@ -706,7 +706,6 @@ ehci_pcd(void *addr)
{
ehci_softc_t *sc = addr;
usbd_xfer_handle xfer;
- usbd_pipe_handle pipe;
u_char *p;
int i, m;
@@ -718,8 +717,6 @@ ehci_pcd(void *addr)
goto done;
}
- pipe = xfer-pipe;
-
p = KERNADDR(xfer-dmabuf, 0);
m = min(sc-sc_noport, xfer-length * 8 - 1);
memset(p, 0, xfer-length);
@@ -3934,7 +3931,6 @@ Static usbd_status
ehci_device_isoc_start(usbd_xfer_handle xfer)
{
struct ehci_pipe *epipe;
- usbd_device_handle dev;
ehci_softc_t *sc;
struct ehci_xfer *exfer;
ehci_soft_itd_t *itd, *prev, *start, *stop;
@@ -3950,7 +3946,6 @@ ehci_device_isoc_start(usbd_xfer_handle
total_length = 0;
exfer = (struct ehci_xfer *) xfer;
sc = xfer-pipe-device-bus-hci_private;
- dev = xfer-pipe-device;
epipe = (struct ehci_pipe *)xfer-pipe;
/*
CVS commit: src/etc/rc.d
Module Name:src
Committed By: christos
Date: Thu Sep 12 19:52:50 UTC 2013
Modified Files:
src/etc/rc.d: ipsec
Log Message:
wait until our local address is available before configuring.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/etc/rc.d/ipsec
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/rc.d/ipsec
diff -u src/etc/rc.d/ipsec:1.12 src/etc/rc.d/ipsec:1.13
--- src/etc/rc.d/ipsec:1.12 Fri Jun 14 12:37:55 2013
+++ src/etc/rc.d/ipsec Thu Sep 12 15:52:50 2013
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: ipsec,v 1.12 2013/06/14 16:37:55 christos Exp $
+# $NetBSD: ipsec,v 1.13 2013/09/12 19:52:50 christos Exp $
#
# PROVIDE: ipsec
@@ -37,14 +37,33 @@ ipsec_getip() {
done
}
+ipsec_load() {
+ if [ -z $1 ]; then
+ /sbin/setkey -f /etc/ipsec.conf
+ else
+ sed -e s/@LOCAL_ADDR@/$1/ /etc/ipsec.conf | \
+ /sbin/setkey -f -
+ fi
+}
+
+ipsec_configure() {
+ while true; do
+ local addr=$(ipsec_getip $ipsec_flags)
+ case $addr in
+ '') sleep 1;;
+ 0.0.0.0) sleep 1;;
+ *) ipsec_load $addr; return;;
+ esac
+ done
+}
+
ipsec_start()
{
echo Installing ipsec manual keys/policies.
if [ -n $ipsec_flags ]; then
- sed -e s/@LOCAL_ADDR@/$(ipsec_getip $ipsec_flags)/ \
- /etc/ipsec.conf | /sbin/setkey -f -
+ ipsec_configure
else
- /sbin/setkey -f /etc/ipsec.conf
+ ipsec_load
fi
}
CVS commit: src/sys/arch/sparc64/dev
Module Name:src Committed By: martin Date: Thu Sep 12 19:51:10 UTC 2013 Modified Files: src/sys/arch/sparc64/dev: ebus_mainbus.c Log Message: #if 0 a variable just like their only use To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/sparc64/dev/ebus_mainbus.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/sparc64/dev/ebus_mainbus.c diff -u src/sys/arch/sparc64/dev/ebus_mainbus.c:1.10 src/sys/arch/sparc64/dev/ebus_mainbus.c:1.11 --- src/sys/arch/sparc64/dev/ebus_mainbus.c:1.10 Sat Oct 27 17:18:12 2012 +++ src/sys/arch/sparc64/dev/ebus_mainbus.c Thu Sep 12 19:51:09 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: ebus_mainbus.c,v 1.10 2012/10/27 17:18:12 chs Exp $ */ +/* $NetBSD: ebus_mainbus.c,v 1.11 2013/09/12 19:51:09 martin Exp $ */ /* $OpenBSD: ebus_mainbus.c,v 1.7 2010/11/11 17:58:23 miod Exp $ */ /* @@ -18,7 +18,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ebus_mainbus.c,v 1.10 2012/10/27 17:18:12 chs Exp $); +__KERNEL_RCSID(0, $NetBSD: ebus_mainbus.c,v 1.11 2013/09/12 19:51:09 martin Exp $); #ifdef DEBUG #define EDB_PROM 0x01 @@ -208,7 +208,10 @@ ebus_mainbus_bus_map(bus_space_tag_t t, struct ebus_softc *sc = t-cookie; struct ebus_mainbus_ranges *range; bus_addr_t hi, lo; - int i, ss; + int i; +#if 0 + int ss; +#endif DPRINTF(EDB_BUSMAP, (\n_ebus_mainbus_bus_map: off %016llx sz %x flags %d, @@ -252,8 +255,6 @@ ebus_mainbus_bus_map(bus_space_tag_t t, panic(ebus_mainbus_bus_map: illegal space %x, ss); break; } -#else -ss = 0; #endif addr = ((bus_addr_t)range[i].phys_hi 32UL) |
CVS commit: src/bin/stty
Module Name:src
Committed By: christos
Date: Thu Sep 12 19:47:23 UTC 2013
Modified Files:
src/bin/stty: extern.h key.c print.c stty.c stty.h
Log Message:
- print the line discipline using the new ioctl
- print the queue size
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/bin/stty/extern.h
cvs rdiff -u -r1.20 -r1.21 src/bin/stty/key.c
cvs rdiff -u -r1.22 -r1.23 src/bin/stty/print.c src/bin/stty/stty.c
cvs rdiff -u -r1.10 -r1.11 src/bin/stty/stty.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/stty/extern.h
diff -u src/bin/stty/extern.h:1.12 src/bin/stty/extern.h:1.13
--- src/bin/stty/extern.h:1.12 Mon Aug 29 10:51:19 2011
+++ src/bin/stty/extern.h Thu Sep 12 15:47:23 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.12 2011/08/29 14:51:19 joerg Exp $ */
+/* $NetBSD: extern.h,v 1.13 2013/09/12 19:47:23 christos Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -43,7 +43,7 @@ void gread(struct termios *, char *);
int ksearch(char ***, struct info *);
int msearch(char ***, struct info *);
void optlist(void);
-void print(struct termios *, struct winsize *, int, enum FMT);
+void print(struct termios *, struct winsize *, int, const char *, enum FMT);
__dead void usage(void);
extern const struct cchar cchars1[], cchars2[];
Index: src/bin/stty/key.c
diff -u src/bin/stty/key.c:1.20 src/bin/stty/key.c:1.21
--- src/bin/stty/key.c:1.20 Thu Apr 1 11:10:03 2004
+++ src/bin/stty/key.c Thu Sep 12 15:47:23 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: key.c,v 1.20 2004/04/01 16:10:03 tsarna Exp $ */
+/* $NetBSD: key.c,v 1.21 2013/09/12 19:47:23 christos Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = @(#)key.c 8.4 (Berkeley) 2/20/95;
#else
-__RCSID($NetBSD: key.c,v 1.20 2004/04/01 16:10:03 tsarna Exp $);
+__RCSID($NetBSD: key.c,v 1.21 2013/09/12 19:47:23 christos Exp $);
#endif
#endif /* not lint */
@@ -146,7 +146,7 @@ ksearch(char ***argvp, struct info *ip)
void
f_all(struct info *ip)
{
- print(ip-t, ip-win, ip-ldisc, STTY_BSD);
+ print(ip-t, ip-win, ip-queue, ip-ldisc, STTY_BSD);
}
void
@@ -185,7 +185,7 @@ f_dec(struct info *ip)
void
f_everything(struct info *ip)
{
- print(ip-t, ip-win, ip-ldisc, STTY_BSD);
+ print(ip-t, ip-win, ip-queue, ip-ldisc, STTY_BSD);
}
void
Index: src/bin/stty/print.c
diff -u src/bin/stty/print.c:1.22 src/bin/stty/print.c:1.23
--- src/bin/stty/print.c:1.22 Sun Jun 26 15:10:49 2005
+++ src/bin/stty/print.c Thu Sep 12 15:47:23 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: print.c,v 1.22 2005/06/26 19:10:49 christos Exp $ */
+/* $NetBSD: print.c,v 1.23 2013/09/12 19:47:23 christos Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = @(#)print.c 8.6 (Berkeley) 4/16/94;
#else
-__RCSID($NetBSD: print.c,v 1.22 2005/06/26 19:10:49 christos Exp $);
+__RCSID($NetBSD: print.c,v 1.23 2013/09/12 19:47:23 christos Exp $);
#endif
#endif /* not lint */
@@ -52,7 +52,8 @@ static void bput(const char *);
static const char *ccval(const struct cchar *, int);
void
-print(struct termios *tp, struct winsize *wp, int ldisc, enum FMT fmt)
+print(struct termios *tp, struct winsize *wp, int queue, const char *ldisc,
+enum FMT fmt)
{
const struct cchar *p;
long tmp;
@@ -62,29 +63,6 @@ print(struct termios *tp, struct winsize
cnt = 0;
- /* Line discipline. */
-#ifdef TTYDISC
- if (ldisc != TTYDISC) {
- switch(ldisc) {
- case TABLDISC:
- cnt += printf(tablet disc; );
- break;
- case SLIPDISC:
- cnt += printf(slip disc; );
- break;
- case PPPDISC:
- cnt += printf(ppp disc; );
- break;
- case STRIPDISC:
- cnt += printf(strip disc; );
- break;
- default:
- cnt += printf(#%d disc; , ldisc);
- break;
- }
- }
-#endif
-
/* Line speed. */
ispeed = cfgetispeed(tp);
ospeed = cfgetospeed(tp);
@@ -93,8 +71,14 @@ print(struct termios *tp, struct winsize
printf(ispeed %d baud; ospeed %d baud;, ispeed, ospeed);
else
cnt += printf(speed %d baud;, ispeed);
- if (fmt = STTY_BSD)
+ if (fmt = STTY_BSD) {
cnt += printf( %d rows; %d columns;, wp-ws_row, wp-ws_col);
+ if (queue)
+ cnt += printf( queue = %d;, queue);
+ if (ldisc)
+ cnt += printf( line = %s;, ldisc);
+ }
+
if (cnt)
(void)printf(\n);
Index: src/bin/stty/stty.c
diff -u src/bin/stty/stty.c:1.22 src/bin/stty/stty.c:1.23
--- src/bin/stty/stty.c:1.22 Wed Jun 20 06:09:43 2012
+++ src/bin/stty/stty.c Thu Sep 12 15:47:23 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: stty.c,v 1.22 2012/06/20 10:09:43 wiz Exp $ */
+/* $NetBSD: stty.c,v 1.23 2013/09/12 19:47:23 christos Exp $ */
/*-
* Copyright (c) 1989, 1991, 1993, 1994
@@ -39,7 +39,7 @@ __COPYRIGHT(@(#) Copyright (c) 1989, 19
#if 0
static char sccsid[] = @(#)stty.c 8.3 (Berkeley) 4/2/94;
#else
-__RCSID($NetBSD: stty.c,v 1.22 2012/06/20 10:09:43 wiz Exp $);
+__RCSID($NetBSD: stty.c,v 1.23 2013/09/12 19:47:23 christos
CVS commit: src/sys/dev/ic
Module Name:src Committed By: martin Date: Thu Sep 12 19:49:08 UTC 2013 Modified Files: src/sys/dev/ic: dpt.c Log Message: Remove unused variable To generate a diff of this commit: cvs rdiff -u -r1.68 -r1.69 src/sys/dev/ic/dpt.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/dev/ic/dpt.c diff -u src/sys/dev/ic/dpt.c:1.68 src/sys/dev/ic/dpt.c:1.69 --- src/sys/dev/ic/dpt.c:1.68 Sat Oct 27 17:18:20 2012 +++ src/sys/dev/ic/dpt.c Thu Sep 12 19:49:08 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: dpt.c,v 1.68 2012/10/27 17:18:20 chs Exp $ */ +/* $NetBSD: dpt.c,v 1.69 2013/09/12 19:49:08 martin Exp $ */ /*- * Copyright (c) 1997, 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc. @@ -71,7 +71,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: dpt.c,v 1.68 2012/10/27 17:18:20 chs Exp $); +__KERNEL_RCSID(0, $NetBSD: dpt.c,v 1.69 2013/09/12 19:49:08 martin Exp $); #include sys/param.h #include sys/systm.h @@ -237,7 +237,6 @@ dpt_intr(void *cookie) struct dpt_softc *sc; struct dpt_ccb *ccb; struct eata_sp *sp; - volatile int junk; int forus; sc = cookie; @@ -279,7 +278,7 @@ dpt_intr(void *cookie) /* Ack the interrupt */ sp-sp_ccbid = -1; - junk = dpt_inb(sc, HA_STATUS); + (void)dpt_inb(sc, HA_STATUS); continue; } @@ -301,7 +300,7 @@ dpt_intr(void *cookie) */ sp-sp_ccbid = -1; ccb-ccb_flg |= CCB_INTR; - junk = dpt_inb(sc, HA_STATUS); + (void)dpt_inb(sc, HA_STATUS); if ((ccb-ccb_flg CCB_PRIVATE) == 0) dpt_ccb_done(sc, ccb); else if ((ccb-ccb_flg CCB_WAIT) != 0)
CVS commit: src/sys/arch/sparc64/dev
Module Name:src Committed By: martin Date: Thu Sep 12 19:57:43 UTC 2013 Modified Files: src/sys/arch/sparc64/dev: ffb.c Log Message: Remove unused variable To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 src/sys/arch/sparc64/dev/ffb.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/sparc64/dev/ffb.c diff -u src/sys/arch/sparc64/dev/ffb.c:1.53 src/sys/arch/sparc64/dev/ffb.c:1.54 --- src/sys/arch/sparc64/dev/ffb.c:1.53 Tue Jul 30 19:16:50 2013 +++ src/sys/arch/sparc64/dev/ffb.c Thu Sep 12 19:57:43 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: ffb.c,v 1.53 2013/07/30 19:16:50 macallan Exp $ */ +/* $NetBSD: ffb.c,v 1.54 2013/09/12 19:57:43 martin Exp $ */ /* $OpenBSD: creator.c,v 1.20 2002/07/30 19:48:15 jason Exp $ */ /* @@ -33,7 +33,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ffb.c,v 1.53 2013/07/30 19:16:50 macallan Exp $); +__KERNEL_RCSID(0, $NetBSD: ffb.c,v 1.54 2013/09/12 19:57:43 martin Exp $); #include sys/types.h #include sys/param.h @@ -201,7 +201,7 @@ ffb_attach(device_t self) const char *model, *out_dev; int btype; uint32_t dac; - int maxrow, maxcol; + int maxrow; u_int blank = WSDISPLAYIO_VIDEO_ON; char buf[6+1]; int i, try_edid; @@ -233,10 +233,6 @@ ffb_attach(device_t self) sc-sc_locked = 0; sc-sc_mode = WSDISPLAYIO_MODE_EMUL; - maxcol = (prom_getoption(screen-#columns, buf, sizeof buf) == 0) - ? strtoul(buf, NULL, 10) - : 80; - maxrow = (prom_getoption(screen-#rows, buf, sizeof buf) != 0) ? strtoul(buf, NULL, 10) : 34;
CVS commit: src/sys/net/agr
Module Name:src
Committed By: martin
Date: Thu Sep 12 20:47:59 UTC 2013
Modified Files:
src/sys/net/agr: if_agr.c
Log Message:
Remove unused variable
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/net/agr/if_agr.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/net/agr/if_agr.c
diff -u src/sys/net/agr/if_agr.c:1.30 src/sys/net/agr/if_agr.c:1.31
--- src/sys/net/agr/if_agr.c:1.30 Wed Oct 19 01:49:50 2011
+++ src/sys/net/agr/if_agr.c Thu Sep 12 20:47:59 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_agr.c,v 1.30 2011/10/19 01:49:50 dyoung Exp $ */
+/* $NetBSD: if_agr.c,v 1.31 2013/09/12 20:47:59 martin Exp $ */
/*-
* Copyright (c)2005 YAMAMOTO Takashi,
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_agr.c,v 1.30 2011/10/19 01:49:50 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_agr.c,v 1.31 2013/09/12 20:47:59 martin Exp $);
#include opt_inet.h
@@ -293,7 +293,6 @@ static void
agr_vlan_check(struct ifnet *ifp, struct agr_softc *sc)
{
struct ethercom *ec = (void *)ifp;
- int error;
/* vlans in sync? */
if (sc-sc_nvlans == ec-ec_nvlans) {
@@ -302,11 +301,11 @@ agr_vlan_check(struct ifnet *ifp, struct
if (sc-sc_nvlans == 0) {
/* vlan added */
- error = agr_port_foreach(sc, agr_vlan_add, NULL);
+ agr_port_foreach(sc, agr_vlan_add, NULL);
sc-sc_nvlans = ec-ec_nvlans;
} else if (ec-ec_nvlans == 0) {
/* vlan removed */
- error = agr_port_foreach(sc, agr_vlan_del, NULL);
+ agr_port_foreach(sc, agr_vlan_del, NULL);
sc-sc_nvlans = 0;
}
}
CVS commit: src/sys/dev/i2c
Module Name:src
Committed By: martin
Date: Thu Sep 12 20:20:03 UTC 2013
Modified Files:
src/sys/dev/i2c: i2c.c
Log Message:
Remove unused variable
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/dev/i2c/i2c.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/dev/i2c/i2c.c
diff -u src/sys/dev/i2c/i2c.c:1.40 src/sys/dev/i2c/i2c.c:1.41
--- src/sys/dev/i2c/i2c.c:1.40 Wed Aug 7 19:38:45 2013
+++ src/sys/dev/i2c/i2c.c Thu Sep 12 20:20:03 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: i2c.c,v 1.40 2013/08/07 19:38:45 soren Exp $ */
+/* $NetBSD: i2c.c,v 1.41 2013/09/12 20:20:03 martin Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: i2c.c,v 1.40 2013/08/07 19:38:45 soren Exp $);
+__KERNEL_RCSID(0, $NetBSD: i2c.c,v 1.41 2013/09/12 20:20:03 martin Exp $);
#include sys/param.h
#include sys/systm.h
@@ -306,7 +306,6 @@ iic_smbus_intr_thread(void *aux)
{
i2c_tag_t ic;
struct ic_intr_list *il;
- int rv;
ic = (i2c_tag_t)aux;
ic-ic_running = 1;
@@ -314,7 +313,7 @@ iic_smbus_intr_thread(void *aux)
while (ic-ic_running) {
if (ic-ic_pending == 0)
- rv = tsleep(ic, PZERO, iicintr, hz);
+ tsleep(ic, PZERO, iicintr, hz);
if (ic-ic_pending 0) {
LIST_FOREACH(il, (ic-ic_proc_list), il_next) {
(*il-il_intr)(il-il_intrarg);
CVS commit: [netbsd-6] src/sys/net/npf
Module Name:src
Committed By: msaitoh
Date: Fri Sep 13 04:12:54 UTC 2013
Modified Files:
src/sys/net/npf [netbsd-6]: npf_inet.c
Log Message:
Pull up following revision (requested by riz in ticket #942):
/sys/net/npf/npf_inet.crevision 1.23
Fix bugs to prevent panic:
- npf_cache_ip: re-fetch IPv6 header since nbufs might have been reallocated.
- npf_cache_all: clear NBUF_DATAREF_RESET since npf_cache_ip() handles it.
To generate a diff of this commit:
cvs rdiff -u -r1.10.4.9 -r1.10.4.10 src/sys/net/npf/npf_inet.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/net/npf/npf_inet.c
diff -u src/sys/net/npf/npf_inet.c:1.10.4.9 src/sys/net/npf/npf_inet.c:1.10.4.10
--- src/sys/net/npf/npf_inet.c:1.10.4.9 Mon Feb 11 21:49:49 2013
+++ src/sys/net/npf/npf_inet.c Fri Sep 13 04:12:54 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_inet.c,v 1.10.4.9 2013/02/11 21:49:49 riz Exp $ */
+/* $NetBSD: npf_inet.c,v 1.10.4.10 2013/09/13 04:12:54 msaitoh Exp $ */
/*-
* Copyright (c) 2009-2012 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: npf_inet.c,v 1.10.4.9 2013/02/11 21:49:49 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: npf_inet.c,v 1.10.4.10 2013/09/13 04:12:54 msaitoh Exp $);
#include sys/param.h
#include sys/types.h
@@ -391,8 +391,12 @@ npf_cache_ip(npf_cache_t *npc, nbuf_t *n
npc-npc_hlen += hlen;
}
- /* Restore the offset. */
+ /*
+ * Re-fetch the header pointers (nbufs might have been
+ * reallocated). Restore the original offset (if any).
+ */
nbuf_reset(nbuf);
+ ip6 = nbuf_dataptr(nbuf);
if (off) {
nbuf_advance(nbuf, off, 0);
}
@@ -437,6 +441,7 @@ again:
*/
flags = npf_cache_ip(npc, nbuf);
if ((flags NPC_IP46) == 0 || (flags NPC_IPFRAG) != 0) {
+ nbuf_unset_flag(nbuf, NBUF_DATAREF_RESET);
npc-npc_info |= flags;
return flags;
}
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: msaitoh Date: Fri Sep 13 04:15:36 UTC 2013 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: Ticket 942. To generate a diff of this commit: cvs rdiff -u -r1.1.2.35 -r1.1.2.36 src/doc/CHANGES-6.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.2 diff -u src/doc/CHANGES-6.2:1.1.2.35 src/doc/CHANGES-6.2:1.1.2.36 --- src/doc/CHANGES-6.2:1.1.2.35 Wed Sep 11 04:00:18 2013 +++ src/doc/CHANGES-6.2 Fri Sep 13 04:15:36 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.2,v 1.1.2.35 2013/09/11 04:00:18 msaitoh Exp $ +# $NetBSD: CHANGES-6.2,v 1.1.2.36 2013/09/13 04:15:36 msaitoh Exp $ A complete list of changes from the 6.1 release until the 6.2 release: @@ -685,3 +685,12 @@ sys/net/bpf.c 1.176 Avoid kernel panic caused by setting a very small bpf buffer size. Fixes PR/48198 reported by Peter Bex. [spz, ticket #941] + +sys/net/npf/npf_inet.c1.23 + + Fix bugs to prevent panic: + - npf_cache_ip: re-fetch IPv6 header since nbufs might have been + reallocated. + - npf_cache_all: clear NBUF_DATAREF_RESET since npf_cache_ip() handles + it. + [riz, ticket #942]
CVS commit: [netbsd-6-1] src/sys/net/npf
Module Name:src
Committed By: msaitoh
Date: Fri Sep 13 04:17:41 UTC 2013
Modified Files:
src/sys/net/npf [netbsd-6-1]: npf_inet.c
Log Message:
Pull up following revision (requested by riz in ticket #942):
/sys/net/npf/npf_inet.crevision 1.23
Fix bugs to prevent panic:
- npf_cache_ip: re-fetch IPv6 header since nbufs might have been reallocated.
- npf_cache_all: clear NBUF_DATAREF_RESET since npf_cache_ip() handles it.
To generate a diff of this commit:
cvs rdiff -u -r1.10.4.9 -r1.10.4.9.2.1 src/sys/net/npf/npf_inet.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/net/npf/npf_inet.c
diff -u src/sys/net/npf/npf_inet.c:1.10.4.9 src/sys/net/npf/npf_inet.c:1.10.4.9.2.1
--- src/sys/net/npf/npf_inet.c:1.10.4.9 Mon Feb 11 21:49:49 2013
+++ src/sys/net/npf/npf_inet.c Fri Sep 13 04:17:41 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_inet.c,v 1.10.4.9 2013/02/11 21:49:49 riz Exp $ */
+/* $NetBSD: npf_inet.c,v 1.10.4.9.2.1 2013/09/13 04:17:41 msaitoh Exp $ */
/*-
* Copyright (c) 2009-2012 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: npf_inet.c,v 1.10.4.9 2013/02/11 21:49:49 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: npf_inet.c,v 1.10.4.9.2.1 2013/09/13 04:17:41 msaitoh Exp $);
#include sys/param.h
#include sys/types.h
@@ -391,8 +391,12 @@ npf_cache_ip(npf_cache_t *npc, nbuf_t *n
npc-npc_hlen += hlen;
}
- /* Restore the offset. */
+ /*
+ * Re-fetch the header pointers (nbufs might have been
+ * reallocated). Restore the original offset (if any).
+ */
nbuf_reset(nbuf);
+ ip6 = nbuf_dataptr(nbuf);
if (off) {
nbuf_advance(nbuf, off, 0);
}
@@ -437,6 +441,7 @@ again:
*/
flags = npf_cache_ip(npc, nbuf);
if ((flags NPC_IP46) == 0 || (flags NPC_IPFRAG) != 0) {
+ nbuf_unset_flag(nbuf, NBUF_DATAREF_RESET);
npc-npc_info |= flags;
return flags;
}
CVS commit: [netbsd-6-1] src/doc
Module Name:src Committed By: msaitoh Date: Fri Sep 13 04:18:50 UTC 2013 Modified Files: src/doc [netbsd-6-1]: CHANGES-6.1.2 Log Message: Ticket 942. To generate a diff of this commit: cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/doc/CHANGES-6.1.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.1.2 diff -u src/doc/CHANGES-6.1.2:1.1.2.3 src/doc/CHANGES-6.1.2:1.1.2.4 --- src/doc/CHANGES-6.1.2:1.1.2.3 Wed Sep 11 04:03:45 2013 +++ src/doc/CHANGES-6.1.2 Fri Sep 13 04:18:50 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1.2,v 1.1.2.3 2013/09/11 04:03:45 msaitoh Exp $ +# $NetBSD: CHANGES-6.1.2,v 1.1.2.4 2013/09/13 04:18:50 msaitoh Exp $ A complete list of changes from the NetBSD 6.1.1 release to the NetBSD 6.1.2 release: @@ -46,3 +46,12 @@ sys/net/bpf.c 1.176 Avoid kernel panic caused by setting a very small bpf buffer size. Fixes PR/48198 reported by Peter Bex. [spz, ticket #941] + +sys/net/npf/npf_inet.c1.23 + + Fix bugs to prevent panic: + - npf_cache_ip: re-fetch IPv6 header since nbufs might have been + reallocated. + - npf_cache_all: clear NBUF_DATAREF_RESET since npf_cache_ip() handles + it. + [riz, ticket #942]
CVS commit: src/usr.bin/nl
Module Name:src Committed By: wiz Date: Thu Sep 12 07:26:13 UTC 2013 Modified Files: src/usr.bin/nl: nl.1 Log Message: Update standards conformance. From jmc@openbsd. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/usr.bin/nl/nl.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/ic
Module Name:src Committed By: martin Date: Thu Sep 12 11:23:37 UTC 2013 Modified Files: src/sys/dev/ic: adwlib.c Log Message: Remove unused ppr_able variable. To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/sys/dev/ic/adwlib.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/isc/atheros_hal/dist
Module Name:src Committed By: martin Date: Thu Sep 12 11:26:53 UTC 2013 Modified Files: src/sys/external/isc/atheros_hal/dist: ah_eeprom_v3.c Log Message: Remove unused maxPower_t4 variable. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/external/isc/atheros_hal/dist/ah_eeprom_v3.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/isc/atheros_hal/dist
Module Name:src Committed By: martin Date: Thu Sep 12 11:38:23 UTC 2013 Modified Files: src/sys/external/isc/atheros_hal/dist: ah_eeprom_v4k.c Log Message: Fix wrong for loop limit To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/sys/external/isc/atheros_hal/dist/ah_eeprom_v4k.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/ic
Module Name:src Committed By: martin Date: Thu Sep 12 11:42:26 UTC 2013 Modified Files: src/sys/dev/ic: an.c Log Message: Eliminate (mostly) unused ostate variable To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.60 src/sys/dev/ic/an.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/isc/atheros_hal/dist/ar5212
Module Name:src Committed By: martin Date: Thu Sep 12 11:44:08 UTC 2013 Modified Files: src/sys/external/isc/atheros_hal/dist/ar5212: ar2316.c Log Message: Remove unused variable To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/sys/external/isc/atheros_hal/dist/ar5212/ar2316.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/isc/atheros_hal/dist/ar5212
Module Name:src Committed By: martin Date: Thu Sep 12 12:04:37 UTC 2013 Modified Files: src/sys/external/isc/atheros_hal/dist/ar5212: ar2413.c Log Message: Remove unused variable To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/sys/external/isc/atheros_hal/dist/ar5212/ar2413.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/isc/atheros_hal/dist/ar5212
Module Name:src Committed By: martin Date: Thu Sep 12 12:05:52 UTC 2013 Modified Files: src/sys/external/isc/atheros_hal/dist/ar5212: ar2425.c Log Message: Remove unused variable To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/sys/external/isc/atheros_hal/dist/ar5212/ar2425.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/isc/atheros_hal/dist/ar5212
Module Name:src Committed By: martin Date: Thu Sep 12 12:07:01 UTC 2013 Modified Files: src/sys/external/isc/atheros_hal/dist/ar5212: ar5413.c Log Message: Remove unused variable To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/sys/external/isc/atheros_hal/dist/ar5212/ar5413.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/isc/atheros_hal/dist/ar5416
Module Name:src Committed By: martin Date: Thu Sep 12 12:08:49 UTC 2013 Modified Files: src/sys/external/isc/atheros_hal/dist/ar5416: ar5416_beacon.c Log Message: Remove unsued variable To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/sys/external/isc/atheros_hal/dist/ar5416/ar5416_beacon.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/isc/atheros_hal/dist/ar5416
Module Name:src Committed By: martin Date: Thu Sep 12 12:10:11 UTC 2013 Modified Files: src/sys/external/isc/atheros_hal/dist/ar5416: ar9280_attach.c Log Message: Remove unused variable To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/sys/external/isc/atheros_hal/dist/ar5416/ar9280_attach.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/isc/atheros_hal/dist/ar5416
Module Name:src Committed By: martin Date: Thu Sep 12 12:11:12 UTC 2013 Modified Files: src/sys/external/isc/atheros_hal/dist/ar5416: ar9285_attach.c Log Message: Remove unused variable To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/sys/external/isc/atheros_hal/dist/ar5416/ar9285_attach.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/ic
Module Name:src Committed By: martin Date: Thu Sep 12 12:17:53 UTC 2013 Modified Files: src/sys/dev/ic: ath.c Log Message: Remove unused variable To generate a diff of this commit: cvs rdiff -u -r1.115 -r1.116 src/sys/dev/ic/ath.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/bluetooth
Module Name:src Committed By: martin Date: Thu Sep 12 12:20:01 UTC 2013 Modified Files: src/sys/dev/bluetooth: btkbd.c Log Message: #ifdef the npress variable, so it is only defined (and initialized) when it is also used. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/dev/bluetooth/btkbd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev
Module Name:src Committed By: martin Date: Thu Sep 12 12:22:41 UTC 2013 Modified Files: src/sys/dev: ccd.c Log Message: #ifdef a few variable declarations/initializations to match their use To generate a diff of this commit: cvs rdiff -u -r1.144 -r1.145 src/sys/dev/ccd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/scsipi
Module Name:src Committed By: martin Date: Thu Sep 12 12:26:13 UTC 2013 Modified Files: src/sys/dev/scsipi: cd.c Log Message: Remove unused variables To generate a diff of this commit: cvs rdiff -u -r1.312 -r1.313 src/sys/dev/scsipi/cd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev
Module Name:src Committed By: martin Date: Thu Sep 12 12:28:49 UTC 2013 Modified Files: src/sys/dev: cgd.c Log Message: #ifdef variable declarations/initializations like their use To generate a diff of this commit: cvs rdiff -u -r1.81 -r1.82 src/sys/dev/cgd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src Committed By: martin Date: Thu Sep 12 12:45:53 UTC 2013 Modified Files: src/sys/arch/sparc64/sparc64: clock.c Log Message: Slightly rearange stopcounter() to compile warning-free with newer gcc To generate a diff of this commit: cvs rdiff -u -r1.112 -r1.113 src/sys/arch/sparc64/sparc64/clock.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/ic
Module Name:src Committed By: martin Date: Thu Sep 12 12:54:39 UTC 2013 Modified Files: src/sys/dev/ic: com.c Log Message: Minor tweaks for newer gcc To generate a diff of this commit: cvs rdiff -u -r1.315 -r1.316 src/sys/dev/ic/com.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/sparc64/dev
Module Name:src Committed By: martin Date: Thu Sep 12 12:57:48 UTC 2013 Modified Files: src/sys/arch/sparc64/dev: consinit.c Log Message: Remove an unused variable, avoid unused variable warning. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sys/arch/sparc64/dev/consinit.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/opencrypto
Module Name:src Committed By: martin Date: Thu Sep 12 13:02:37 UTC 2013 Modified Files: src/sys/opencrypto: cryptodev.c Log Message: Fix return value of cryptodev_msessionfin. To generate a diff of this commit: cvs rdiff -u -r1.68 -r1.69 src/sys/opencrypto/cryptodev.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/opencrypto
Module Name:src Committed By: martin Date: Thu Sep 12 13:12:35 UTC 2013 Modified Files: src/sys/opencrypto: cryptosoft.c Log Message: Remove unused variable To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/sys/opencrypto/cryptosoft.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/arm32
Module Name:src Committed By: kiyohara Date: Thu Sep 12 14:45:18 UTC 2013 Modified Files: src/sys/arch/arm/arm32: pmap.c Log Message: Fix VIVT cache operation. Tested on Kirkwood machines. To generate a diff of this commit: cvs rdiff -u -r1.263 -r1.264 src/sys/arch/arm/arm32/pmap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: joerg Date: Thu Sep 12 15:36:17 UTC 2013 Modified Files: src/common/lib/libc/arch/arm/gen: divsi3.S udivsi3.S src/common/lib/libc/arch/sparc/atomic: atomic_cas.S src/common/lib/libc/arch/sparc/string: ffs.S src/common/lib/libc/arch/sparc64/string: ffs.S src/external/gpl3/gcc/lib/libgcc/libgcc: Makefile src/external/mit/xorg/server/xorg-server/Xext/Xextmodule: Makefile src/lib/csu/arch/sh3: crtbegin.S src/lib/csu/common: Makefile.inc src/lib/libc/arch/arm/gen: _setjmp.S setjmp.S src/lib/libc/arch/arm/sys: brk.S cerror.S ptrace.S sbrk.S src/lib/libc/arch/hppa/gen: _resumecontext.S src/lib/libc/arch/hppa/sys: brk.S cerror.S sbrk.S src/lib/libc/arch/i386: SYS.h src/lib/libc/arch/i386/gen: fixunsdfsi.S resumecontext.S setjmp.S sigsetjmp.S swapcontext.S src/lib/libc/arch/i386/sys: __clone.S brk.S cerror.S ptrace.S sbrk.S src/lib/libc/arch/m68k/sys: __vfork14.S brk.S cerror.S ptrace.S src/lib/libc/arch/mips/sys: cerror.S src/lib/libc/arch/powerpc/gen: swapcontext.S src/lib/libc/arch/powerpc/string: bzero.S src/lib/libc/arch/powerpc/sys: __clone.S brk.S cerror.S ptrace.S sbrk.S src/lib/libc/arch/powerpc64/sys: cerror.S ptrace.S src/lib/libc/arch/sh3: SYS.h src/lib/libc/arch/sh3/gen: swapcontext.S src/lib/libc/arch/sh3/sys: __clone.S brk.S cerror.S ptrace.S sbrk.S src/lib/libc/arch/sparc: SYS.h src/lib/libc/arch/sparc/gen: fixunsdfsi.S modf.S sigsetjmp.S swapcontext.S src/lib/libc/arch/sparc/sys: brk.S cerror.S ptrace.S sbrk.S src/lib/libc/arch/sparc64: SYS.h src/lib/libc/arch/sparc64/gen: fixunsdfsi.S modf.S setjmp.S sigsetjmp.S swapcontext.S src/lib/libc/arch/sparc64/sys: brk.S cerror.S sbrk.S src/lib/libc/arch/x86_64/gen: __setjmp14.S __sigsetjmp14.S resumecontext.S swapcontext.S src/lib/libc/arch/x86_64/sys: __clone.S brk.S cerror.S ptrace.S sbrk.S src/lib/libc/compat/arch/i386/gen: compat_setjmp.S compat_sigsetjmp.S src/lib/libc/compat/arch/i386/sys: compat_Ovfork.S compat_sigprocmask.S compat_sigsuspend.S src/lib/libc/compat/arch/m68k/sys: compat_Ovfork.S src/lib/libc/compat/arch/sparc/gen: compat_sigsetjmp.S src/lib/libc/compat/arch/sparc64/gen: compat_sigsetjmp.S src/lib/libc/compat/arch/x86_64/sys: compat_Ovfork.S compat_sigprocmask.S compat_sigsuspend.S src/lib/libm/arch/i387: abi.h src/share/mk: bsd.lib.mk bsd.lua.mk bsd.sys.mk src/sys/arch/amd64/include: asm.h profile.h src/sys/arch/arm/include: asm.h profile.h src/sys/arch/hppa/include: asm.h src/sys/arch/i386/include: asm.h src/sys/arch/m68k/include: asm.h src/sys/arch/powerpc/include: asm.h profile.h src/sys/arch/sh3/include: asm.h src/sys/arch/sparc/include: asm.h profile.h src/sys/lib/libkern/arch/hppa: prefix.h src/sys/lib/libkern/arch/sparc: random.S src/sys/lib/libkern/arch/sparc64: random.S Log Message: Pass PICFLAGS down to cc-as-as and use __PIC__ to decide if it is small vs big PIC mode. Retire -DPIC and -DBIGPIC. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/common/lib/libc/arch/arm/gen/divsi3.S cvs rdiff -u -r1.8 -r1.9 src/common/lib/libc/arch/arm/gen/udivsi3.S cvs rdiff -u -r1.11 -r1.12 src/common/lib/libc/arch/sparc/atomic/atomic_cas.S cvs rdiff -u -r1.3 -r1.4 src/common/lib/libc/arch/sparc/string/ffs.S cvs rdiff -u -r1.2 -r1.3 src/common/lib/libc/arch/sparc64/string/ffs.S cvs rdiff -u -r1.14 -r1.15 src/external/gpl3/gcc/lib/libgcc/libgcc/Makefile cvs rdiff -u -r1.6 -r1.7 \ src/external/mit/xorg/server/xorg-server/Xext/Xextmodule/Makefile cvs rdiff -u -r1.2 -r1.3 src/lib/csu/arch/sh3/crtbegin.S cvs rdiff -u -r1.17 -r1.18 src/lib/csu/common/Makefile.inc cvs rdiff -u -r1.13 -r1.14 src/lib/libc/arch/arm/gen/_setjmp.S cvs rdiff -u -r1.15 -r1.16 src/lib/libc/arch/arm/gen/setjmp.S cvs rdiff -u -r1.12 -r1.13 src/lib/libc/arch/arm/sys/brk.S cvs rdiff -u -r1.11 -r1.12 src/lib/libc/arch/arm/sys/cerror.S \ src/lib/libc/arch/arm/sys/sbrk.S cvs rdiff -u -r1.10 -r1.11 src/lib/libc/arch/arm/sys/ptrace.S cvs rdiff -u -r1.3 -r1.4 src/lib/libc/arch/hppa/gen/_resumecontext.S cvs rdiff -u -r1.5 -r1.6 src/lib/libc/arch/hppa/sys/brk.S \ src/lib/libc/arch/hppa/sys/sbrk.S cvs rdiff -u -r1.4 -r1.5 src/lib/libc/arch/hppa/sys/cerror.S cvs rdiff -u -r1.23 -r1.24 src/lib/libc/arch/i386/SYS.h cvs rdiff -u -r1.12 -r1.13 src/lib/libc/arch/i386/gen/fixunsdfsi.S cvs rdiff -u -r1.6 -r1.7 src/lib/libc/arch/i386/gen/resumecontext.S \ src/lib/libc/arch/i386/gen/swapcontext.S cvs rdiff -u -r1.14 -r1.15 src/lib/libc/arch/i386/gen/setjmp.S cvs rdiff -u -r1.16 -r1.17 src/lib/libc/arch/i386/gen/sigsetjmp.S cvs rdiff -u
CVS commit: src/sys/arch/arm/cortex
Module Name:src Committed By: matt Date: Thu Sep 12 15:38:04 UTC 2013 Modified Files: src/sys/arch/arm/cortex: gtmr.c gtmr_var.h Log Message: Cleanup some diagnostic code. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/cortex/gtmr.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/cortex/gtmr_var.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/stdlib
Module Name:src Committed By: joerg Date: Thu Sep 12 15:35:16 UTC 2013 Modified Files: src/lib/libc/stdlib: jemalloc.c Log Message: NetBSD certainly supports TLS in static applications if it supports TLS on the platform at all. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/lib/libc/stdlib/jemalloc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: martin Date: Thu Sep 12 19:37:19 UTC 2013 Modified Files: src/sys/dev/pci: cz.c Log Message: Eliminate an unused variable - someone with docs and test hardware please check the XXX introduced. To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/sys/dev/pci/cz.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src Committed By: martin Date: Thu Sep 12 19:38:59 UTC 2013 Modified Files: src/sys/arch/sparc64/sparc64: db_interface.c Log Message: Remove unused variable To generate a diff of this commit: cvs rdiff -u -r1.131 -r1.132 src/sys/arch/sparc64/sparc64/db_interface.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/i2c
Module Name:src Committed By: martin Date: Thu Sep 12 19:46:31 UTC 2013 Modified Files: src/sys/dev/i2c: dbcool.c Log Message: Remove unused variables To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/sys/dev/i2c/dbcool.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/i2c
Module Name:src Committed By: martin Date: Thu Sep 12 20:30:58 UTC 2013 Modified Files: src/sys/dev/i2c: i2c_exec.c Log Message: Fix evil sizeof(void*) botch To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/dev/i2c/i2c_exec.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/ipf/netinet
Module Name:src Committed By: martin Date: Thu Sep 12 20:03:10 UTC 2013 Modified Files: src/sys/external/bsd/ipf/netinet: fil.c Log Message: Remove unused variable To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/ipf/netinet/fil.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/ic
Module Name:src Committed By: martin Date: Thu Sep 12 20:40:46 UTC 2013 Modified Files: src/sys/dev/ic: i82557.c Log Message: Remove unused variable To generate a diff of this commit: cvs rdiff -u -r1.140 -r1.141 src/sys/dev/ic/i82557.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/net80211
Module Name:src Committed By: martin Date: Thu Sep 12 20:44:02 UTC 2013 Modified Files: src/sys/net80211: ieee80211_ioctl.c Log Message: Fix return value of ieee80211_ioctl_setoptie To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/sys/net80211/ieee80211_ioctl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: joerg Date: Thu Sep 12 17:14:20 UTC 2013 Modified Files: src/external/bsd/atf/lib/libatf-c++: Makefile src/external/bsd/kyua-cli/lib: Makefile.inc src/external/bsd/lutok/lib/liblutok: Makefile src/external/mit/xorg/bin/glxinfo: Makefile src/external/mit/xorg/lib/libGLU: Makefile src/share/mk: bsd.lib.mk src/x11/bin/glxinfo: Makefile src/x11/lib/GLU: Makefile Log Message: Handle dependency on libstdc++ / libc++ in bsd.lib.mk. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/external/bsd/atf/lib/libatf-c++/Makefile cvs rdiff -u -r1.1 -r1.2 src/external/bsd/kyua-cli/lib/Makefile.inc cvs rdiff -u -r1.2 -r1.3 src/external/bsd/lutok/lib/liblutok/Makefile cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/glxinfo/Makefile cvs rdiff -u -r1.11 -r1.12 src/external/mit/xorg/lib/libGLU/Makefile cvs rdiff -u -r1.338 -r1.339 src/share/mk/bsd.lib.mk cvs rdiff -u -r1.3 -r1.4 src/x11/bin/glxinfo/Makefile cvs rdiff -u -r1.9 -r1.10 src/x11/lib/GLU/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src Committed By: christos Date: Thu Sep 12 19:01:38 UTC 2013 Modified Files: src/sys/kern: kern_exec.c Log Message: What's the point of having a module exec class if exec is not using it? To generate a diff of this commit: cvs rdiff -u -r1.362 -r1.363 src/sys/kern/kern_exec.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: martin Date: Thu Sep 12 21:11:37 UTC 2013 Modified Files: src/sys/dev/pci: if_bge.c Log Message: Remove unused variable To generate a diff of this commit: cvs rdiff -u -r1.258 -r1.259 src/sys/dev/pci/if_bge.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/ieee1394
Module Name:src Committed By: martin Date: Thu Sep 12 20:16:51 UTC 2013 Modified Files: src/sys/dev/ieee1394: fwohci.c Log Message: Make it compilable with gcc 4.8.1 To generate a diff of this commit: cvs rdiff -u -r1.134 -r1.135 src/sys/dev/ieee1394/fwohci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src Committed By: christos Date: Thu Sep 12 19:02:05 UTC 2013 Modified Files: src/sys/kern: kern_module.c Log Message: Silence some common module load errors and explain why. To generate a diff of this commit: cvs rdiff -u -r1.91 -r1.92 src/sys/kern/kern_module.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: martin Date: Thu Sep 12 21:03:11 UTC 2013 Modified Files: src/sys/dev/usb: if_axe.c Log Message: #ifdef some variables just like their use To generate a diff of this commit: cvs rdiff -u -r1.64 -r1.65 src/sys/dev/usb/if_axe.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/nfs
Module Name:src Committed By: drochner Date: Thu Sep 12 18:00:18 UTC 2013 Modified Files: src/sys/nfs: nfs_bootparam.c Log Message: tyop in comment, from Eivind Evensen via OpenBSD To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/sys/nfs/nfs_bootparam.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/ic
Module Name:src Committed By: martin Date: Thu Sep 12 19:49:08 UTC 2013 Modified Files: src/sys/dev/ic: dpt.c Log Message: Remove unused variable To generate a diff of this commit: cvs rdiff -u -r1.68 -r1.69 src/sys/dev/ic/dpt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: martin Date: Thu Sep 12 19:53:41 UTC 2013 Modified Files: src/sys/dev/usb: ehci.c Log Message: Remove unused variables To generate a diff of this commit: cvs rdiff -u -r1.211 -r1.212 src/sys/dev/usb/ehci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc/rc.d
Module Name:src Committed By: christos Date: Thu Sep 12 19:52:50 UTC 2013 Modified Files: src/etc/rc.d: ipsec Log Message: wait until our local address is available before configuring. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/etc/rc.d/ipsec Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
