Module Name: src
Committed By: pgoyette
Date: Mon Jun 20 17:29:06 UTC 2011
Modified Files:
src/sys/dev/pci: arcmsr.c viaenv.c
Log Message:
Initialize sensors states before registering.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/pci/arcmsr.c
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/pci/viaenv.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/arcmsr.c
diff -u src/sys/dev/pci/arcmsr.c:1.28 src/sys/dev/pci/arcmsr.c:1.29
--- src/sys/dev/pci/arcmsr.c:1.28 Mon Jun 20 13:26:58 2011
+++ src/sys/dev/pci/arcmsr.c Mon Jun 20 17:29:06 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: arcmsr.c,v 1.28 2011/06/20 13:26:58 pgoyette Exp $ */
+/* $NetBSD: arcmsr.c,v 1.29 2011/06/20 17:29:06 pgoyette Exp $ */
/* $OpenBSD: arc.c,v 1.68 2007/10/27 03:28:27 dlg Exp $ */
/*
@@ -21,7 +21,7 @@
#include "bio.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arcmsr.c,v 1.28 2011/06/20 13:26:58 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arcmsr.c,v 1.29 2011/06/20 17:29:06 pgoyette Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -1746,6 +1746,7 @@
goto bad;
sc->sc_arc_sensors[count].arc_sensor.units = ENVSYS_DRIVE;
+ sc->sc_arc_sensors[count].arc_sensor.state = ENVSYS_SINVALID;
sc->sc_arc_sensors[count].arc_sensor.flags =
ENVSYS_FMONSTCHANGED;
@@ -1773,6 +1774,8 @@
/* Attach disk sensors for this volume */
for (j = 0; j < bv.bv_nodisk; j++) {
+ sc->sc_arc_sensors[count].arc_sensor.state =
+ ENVSYS_SINVALID;
sc->sc_arc_sensors[count].arc_sensor.units =
ENVSYS_DRIVE;
sc->sc_arc_sensors[count].arc_sensor.flags =
Index: src/sys/dev/pci/viaenv.c
diff -u src/sys/dev/pci/viaenv.c:1.30 src/sys/dev/pci/viaenv.c:1.31
--- src/sys/dev/pci/viaenv.c:1.30 Fri Dec 10 21:20:09 2010
+++ src/sys/dev/pci/viaenv.c Mon Jun 20 17:29:06 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: viaenv.c,v 1.30 2010/12/10 21:20:09 phx Exp $ */
+/* $NetBSD: viaenv.c,v 1.31 2011/06/20 17:29:06 pgoyette Exp $ */
/*
* Copyright (c) 2000 Johan Danielsson
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: viaenv.c,v 1.30 2010/12/10 21:20:09 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: viaenv.c,v 1.31 2011/06/20 17:29:06 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -343,6 +343,9 @@
#undef COPYDESCR
+ for (i = 0; i < 10; i++)
+ sc->sc_sensor[i].state = ENVSYS_SINVALID;
+
sc->sc_sme = sysmon_envsys_create();
/* Initialize sensors */
