Module Name: src
Committed By: pgoyette
Date: Sun Mar 14 18:04:29 UTC 2010
Modified Files:
src/sys/arch/x86/x86: coretemp.c ipmi.c viac7temp.c
Log Message:
Remove setting of the edata->monitor since that member no longer exists.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/x86/x86/coretemp.c
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/x86/x86/ipmi.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/x86/x86/viac7temp.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/x86/x86/coretemp.c
diff -u src/sys/arch/x86/x86/coretemp.c:1.13 src/sys/arch/x86/x86/coretemp.c:1.14
--- src/sys/arch/x86/x86/coretemp.c:1.13 Thu Dec 3 14:44:12 2009
+++ src/sys/arch/x86/x86/coretemp.c Sun Mar 14 18:04:29 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: coretemp.c,v 1.13 2009/12/03 14:44:12 sborrill Exp $ */
+/* $NetBSD: coretemp.c,v 1.14 2010/03/14 18:04:29 pgoyette Exp $ */
/*-
* Copyright (c) 2007 Juan Romero Pardines.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: coretemp.c,v 1.13 2009/12/03 14:44:12 sborrill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: coretemp.c,v 1.14 2010/03/14 18:04:29 pgoyette Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -138,7 +138,6 @@
*/
sc->sc_sensor.units = ENVSYS_STEMP;
sc->sc_sensor.flags = ENVSYS_FMONCRITICAL;
- sc->sc_sensor.monitor = true;
(void)snprintf(sc->sc_sensor.desc, sizeof(sc->sc_sensor.desc),
"%s temperature", device_xname(ci->ci_dev));
Index: src/sys/arch/x86/x86/ipmi.c
diff -u src/sys/arch/x86/x86/ipmi.c:1.43 src/sys/arch/x86/x86/ipmi.c:1.44
--- src/sys/arch/x86/x86/ipmi.c:1.43 Sun Feb 14 23:07:59 2010
+++ src/sys/arch/x86/x86/ipmi.c Sun Mar 14 18:04:29 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ipmi.c,v 1.43 2010/02/14 23:07:59 pgoyette Exp $ */
+/* $NetBSD: ipmi.c,v 1.44 2010/03/14 18:04:29 pgoyette Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipmi.c,v 1.43 2010/02/14 23:07:59 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipmi.c,v 1.44 2010/03/14 18:04:29 pgoyette Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -1877,7 +1877,6 @@
ipmi_s->i_props = 0;
sc->sc_sensor[i].units = ipmi_s->i_envtype;
sc->sc_sensor[i].state = ENVSYS_SINVALID;
- sc->sc_sensor[i].monitor = true;
/*
* Monitor threshold limits in the sensors.
*/
Index: src/sys/arch/x86/x86/viac7temp.c
diff -u src/sys/arch/x86/x86/viac7temp.c:1.1 src/sys/arch/x86/x86/viac7temp.c:1.2
--- src/sys/arch/x86/x86/viac7temp.c:1.1 Fri Oct 2 18:50:03 2009
+++ src/sys/arch/x86/x86/viac7temp.c Sun Mar 14 18:04:29 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: viac7temp.c,v 1.1 2009/10/02 18:50:03 jmcneill Exp $ */
+/* $NetBSD: viac7temp.c,v 1.2 2010/03/14 18:04:29 pgoyette Exp $ */
/*-
* Copyright (c) 2009 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: viac7temp.c,v 1.1 2009/10/02 18:50:03 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: viac7temp.c,v 1.2 2010/03/14 18:04:29 pgoyette Exp $");
#include <sys/param.h>
#include <sys/kmem.h>
@@ -58,8 +58,7 @@
sc = kmem_zalloc(sizeof(struct viac7temp_softc), KM_SLEEP);
sc->sc_sensor.units = ENVSYS_STEMP;
- sc->sc_sensor.flags = 0;
- sc->sc_sensor.monitor = true;
+ sc->sc_sensor.flags = ENVSYS_FMONLIMITS;
strlcpy(sc->sc_sensor.desc, "temperature",
sizeof(sc->sc_sensor.desc));
