Module Name: src
Committed By: pgoyette
Date: Thu Apr 23 23:23:01 UTC 2015
Modified Files:
src/sys/arch/x86/pci: amdtemp.c
src/sys/arch/x86/x86: coretemp.c vmt.c
src/sys/dev/acpi: acpi_acad.c acpi_bat.c acpi_button.c acpi_fan.c
acpi_lid.c acpi_pmtr.c acpi_tz.c acpi_wdrt.c aibs_acpi.c
asus_acpi.c dalb_acpi.c fujhk_acpi.c hpacel_acpi.c hpqlb_acpi.c
thinkpad_acpi.c
src/sys/dev/acpi/wmi: wmi_dell.c wmi_eeepc.c wmi_hp.c
src/sys/dev/i2c: dbcool.c hytp14.c sdtemp.c
src/sys/dev/ic: apple_smc_fan.c apple_smc_temp.c nslm7x.c
src/sys/dev/isa: aps.c finsio_isa.c itesio_isa.c nsclpcsio_isa.c smsc.c
src/sys/dev/pci: pwdog.c
src/sys/dev/sysmon: swsensor.c swwdog.c
Log Message:
Update module dependencies for all the existing modules that depend on sysmon
components.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/x86/pci/amdtemp.c
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/x86/x86/coretemp.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/x86/x86/vmt.c
cvs rdiff -u -r1.50 -r1.51 src/sys/dev/acpi/acpi_acad.c
cvs rdiff -u -r1.114 -r1.115 src/sys/dev/acpi/acpi_bat.c
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/acpi/acpi_button.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/acpi/acpi_fan.c \
src/sys/dev/acpi/acpi_pmtr.c
cvs rdiff -u -r1.43 -r1.44 src/sys/dev/acpi/acpi_lid.c
cvs rdiff -u -r1.87 -r1.88 src/sys/dev/acpi/acpi_tz.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/acpi/acpi_wdrt.c \
src/sys/dev/acpi/fujhk_acpi.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/acpi/aibs_acpi.c \
src/sys/dev/acpi/hpacel_acpi.c
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/acpi/asus_acpi.c
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/acpi/dalb_acpi.c
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/acpi/hpqlb_acpi.c
cvs rdiff -u -r1.44 -r1.45 src/sys/dev/acpi/thinkpad_acpi.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/acpi/wmi/wmi_dell.c \
src/sys/dev/acpi/wmi/wmi_hp.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/acpi/wmi/wmi_eeepc.c
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/i2c/dbcool.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/i2c/hytp14.c
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/i2c/sdtemp.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/ic/apple_smc_fan.c \
src/sys/dev/ic/apple_smc_temp.c
cvs rdiff -u -r1.61 -r1.62 src/sys/dev/ic/nslm7x.c
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/isa/aps.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/isa/finsio_isa.c
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/isa/itesio_isa.c
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/isa/nsclpcsio_isa.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/isa/smsc.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/pci/pwdog.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/sysmon/swsensor.c
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/sysmon/swwdog.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/pci/amdtemp.c
diff -u src/sys/arch/x86/pci/amdtemp.c:1.18 src/sys/arch/x86/pci/amdtemp.c:1.19
--- src/sys/arch/x86/pci/amdtemp.c:1.18 Fri Nov 15 08:47:55 2013
+++ src/sys/arch/x86/pci/amdtemp.c Thu Apr 23 23:23:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: amdtemp.c,v 1.18 2013/11/15 08:47:55 msaitoh Exp $ */
+/* $NetBSD: amdtemp.c,v 1.19 2015/04/23 23:23:00 pgoyette Exp $ */
/* $OpenBSD: kate.c,v 1.2 2008/03/27 04:52:03 cnst Exp $ */
/*
@@ -48,7 +48,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdtemp.c,v 1.18 2013/11/15 08:47:55 msaitoh Exp $ ");
+__KERNEL_RCSID(0, "$NetBSD: amdtemp.c,v 1.19 2015/04/23 23:23:00 pgoyette Exp $ ");
#include <sys/param.h>
#include <sys/bus.h>
@@ -519,7 +519,7 @@ amdtemp_family10_refresh(struct sysmon_e
edata->value_cur = (value * 125000) + 273150000; /* From C to uK. */
}
-MODULE(MODULE_CLASS_DRIVER, amdtemp, NULL);
+MODULE(MODULE_CLASS_DRIVER, amdtemp, "sysmon_envsys");
#ifdef _MODULE
#include "ioconf.c"
Index: src/sys/arch/x86/x86/coretemp.c
diff -u src/sys/arch/x86/x86/coretemp.c:1.32 src/sys/arch/x86/x86/coretemp.c:1.33
--- src/sys/arch/x86/x86/coretemp.c:1.32 Sun Nov 17 18:08:08 2013
+++ src/sys/arch/x86/x86/coretemp.c Thu Apr 23 23:23:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: coretemp.c,v 1.32 2013/11/17 18:08:08 martin Exp $ */
+/* $NetBSD: coretemp.c,v 1.33 2015/04/23 23:23:00 pgoyette Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: coretemp.c,v 1.32 2013/11/17 18:08:08 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: coretemp.c,v 1.33 2015/04/23 23:23:00 pgoyette Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -349,7 +349,7 @@ coretemp_refresh_xcall(void *arg0, void
edata->state = ENVSYS_SCRITICAL;
}
-MODULE(MODULE_CLASS_DRIVER, coretemp, NULL);
+MODULE(MODULE_CLASS_DRIVER, coretemp, "sysmon_envsys");
#ifdef _MODULE
#include "ioconf.c"
Index: src/sys/arch/x86/x86/vmt.c
diff -u src/sys/arch/x86/x86/vmt.c:1.10 src/sys/arch/x86/x86/vmt.c:1.11
--- src/sys/arch/x86/x86/vmt.c:1.10 Fri Jul 25 07:12:55 2014
+++ src/sys/arch/x86/x86/vmt.c Thu Apr 23 23:23:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: vmt.c,v 1.10 2014/07/25 07:12:55 ozaki-r Exp $ */
+/* $NetBSD: vmt.c,v 1.11 2015/04/23 23:23:00 pgoyette Exp $ */
/* $OpenBSD: vmt.c,v 1.11 2011/01/27 21:29:25 dtucker Exp $ */
/*
@@ -1300,7 +1300,7 @@ vm_rpc_send_rpci_tx(struct vmt_softc *sc
* match the register values to the various constants in this file.
*/
-MODULE(MODULE_CLASS_DRIVER, vmt, NULL);
+MODULE(MODULE_CLASS_DRIVER, vmt, "sysmon_power,sysmon_taskq");
#ifdef _MODULE
#include "ioconf.c"
Index: src/sys/dev/acpi/acpi_acad.c
diff -u src/sys/dev/acpi/acpi_acad.c:1.50 src/sys/dev/acpi/acpi_acad.c:1.51
--- src/sys/dev/acpi/acpi_acad.c:1.50 Fri Jun 3 18:40:41 2011
+++ src/sys/dev/acpi/acpi_acad.c Thu Apr 23 23:23:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_acad.c,v 1.50 2011/06/03 18:40:41 jruoho Exp $ */
+/* $NetBSD: acpi_acad.c,v 1.51 2015/04/23 23:23:00 pgoyette Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_acad.c,v 1.50 2011/06/03 18:40:41 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_acad.c,v 1.51 2015/04/23 23:23:00 pgoyette Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -285,7 +285,7 @@ fail:
sc->sc_sme = NULL;
}
-MODULE(MODULE_CLASS_DRIVER, acpiacad, NULL);
+MODULE(MODULE_CLASS_DRIVER, acpiacad, "sysmon_envsys,sysmon_power");
#ifdef _MODULE
#include "ioconf.c"
Index: src/sys/dev/acpi/acpi_bat.c
diff -u src/sys/dev/acpi/acpi_bat.c:1.114 src/sys/dev/acpi/acpi_bat.c:1.115
--- src/sys/dev/acpi/acpi_bat.c:1.114 Wed Dec 31 22:01:01 2014
+++ src/sys/dev/acpi/acpi_bat.c Thu Apr 23 23:23:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_bat.c,v 1.114 2014/12/31 22:01:01 mlelstv Exp $ */
+/* $NetBSD: acpi_bat.c,v 1.115 2015/04/23 23:23:00 pgoyette Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.114 2014/12/31 22:01:01 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_bat.c,v 1.115 2015/04/23 23:23:00 pgoyette Exp $");
#include <sys/param.h>
#include <sys/condvar.h>
@@ -851,7 +851,7 @@ acpibat_get_limits(struct sysmon_envsys
*props |= PROP_BATTCAP | PROP_BATTWARN | PROP_DRIVER_LIMITS;
}
-MODULE(MODULE_CLASS_DRIVER, acpibat, NULL);
+MODULE(MODULE_CLASS_DRIVER, acpibat, "sysmon_envsys");
#ifdef _MODULE
#include "ioconf.c"
Index: src/sys/dev/acpi/acpi_button.c
diff -u src/sys/dev/acpi/acpi_button.c:1.41 src/sys/dev/acpi/acpi_button.c:1.42
--- src/sys/dev/acpi/acpi_button.c:1.41 Sun Feb 20 06:59:53 2011
+++ src/sys/dev/acpi/acpi_button.c Thu Apr 23 23:23:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_button.c,v 1.41 2011/02/20 06:59:53 jruoho Exp $ */
+/* $NetBSD: acpi_button.c,v 1.42 2015/04/23 23:23:00 pgoyette Exp $ */
/*
* Copyright 2001, 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_button.c,v 1.41 2011/02/20 06:59:53 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_button.c,v 1.42 2015/04/23 23:23:00 pgoyette Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -200,7 +200,7 @@ acpibut_notify_handler(ACPI_HANDLE handl
}
}
-MODULE(MODULE_CLASS_DRIVER, acpibut, NULL);
+MODULE(MODULE_CLASS_DRIVER, acpibut, "sysmon_power");
#ifdef _MODULE
#include "ioconf.c"
Index: src/sys/dev/acpi/acpi_fan.c
diff -u src/sys/dev/acpi/acpi_fan.c:1.7 src/sys/dev/acpi/acpi_fan.c:1.8
--- src/sys/dev/acpi/acpi_fan.c:1.7 Fri Jul 22 04:15:05 2011
+++ src/sys/dev/acpi/acpi_fan.c Thu Apr 23 23:23:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_fan.c,v 1.7 2011/07/22 04:15:05 jruoho Exp $ */
+/* $NetBSD: acpi_fan.c,v 1.8 2015/04/23 23:23:00 pgoyette Exp $ */
/*-
* Copyright (c) 2011 Jukka Ruohonen <jruoho...@iki.fi>
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_fan.c,v 1.7 2011/07/22 04:15:05 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_fan.c,v 1.8 2015/04/23 23:23:00 pgoyette Exp $");
#include <sys/param.h>
#include <sys/module.h>
@@ -228,7 +228,7 @@ acpifan_sensor_refresh(struct sysmon_env
(void)AcpiOsExecute(OSL_NOTIFY_HANDLER, acpifan_sensor_state, self);
}
-MODULE(MODULE_CLASS_DRIVER, acpifan, NULL);
+MODULE(MODULE_CLASS_DRIVER, acpifan, "sysmon_envsys");
#ifdef _MODULE
#include "ioconf.c"
Index: src/sys/dev/acpi/acpi_pmtr.c
diff -u src/sys/dev/acpi/acpi_pmtr.c:1.7 src/sys/dev/acpi/acpi_pmtr.c:1.8
--- src/sys/dev/acpi/acpi_pmtr.c:1.7 Tue Jun 21 09:49:05 2011
+++ src/sys/dev/acpi/acpi_pmtr.c Thu Apr 23 23:23:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_pmtr.c,v 1.7 2011/06/21 09:49:05 jruoho Exp $ */
+/* $NetBSD: acpi_pmtr.c,v 1.8 2015/04/23 23:23:00 pgoyette Exp $ */
/*-
* Copyright (c) 2011 Jukka Ruohonen <jruoho...@iki.fi>
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_pmtr.c,v 1.7 2011/06/21 09:49:05 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_pmtr.c,v 1.8 2015/04/23 23:23:00 pgoyette Exp $");
#include <sys/param.h>
#include <sys/module.h>
@@ -505,7 +505,7 @@ acpipmtr_notify(ACPI_HANDLE hdl, uint32_
}
}
-MODULE(MODULE_CLASS_DRIVER, acpipmtr, NULL);
+MODULE(MODULE_CLASS_DRIVER, acpipmtr, "sysmon_envsys");
#ifdef _MODULE
#include "ioconf.c"
Index: src/sys/dev/acpi/acpi_lid.c
diff -u src/sys/dev/acpi/acpi_lid.c:1.43 src/sys/dev/acpi/acpi_lid.c:1.44
--- src/sys/dev/acpi/acpi_lid.c:1.43 Wed Feb 16 08:35:51 2011
+++ src/sys/dev/acpi/acpi_lid.c Thu Apr 23 23:23:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_lid.c,v 1.43 2011/02/16 08:35:51 jruoho Exp $ */
+/* $NetBSD: acpi_lid.c,v 1.44 2015/04/23 23:23:00 pgoyette Exp $ */
/*
* Copyright 2001, 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_lid.c,v 1.43 2011/02/16 08:35:51 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_lid.c,v 1.44 2015/04/23 23:23:00 pgoyette Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -173,7 +173,7 @@ acpilid_notify_handler(ACPI_HANDLE handl
}
}
-MODULE(MODULE_CLASS_DRIVER, acpilid, NULL);
+MODULE(MODULE_CLASS_DRIVER, acpilid, "sysmon_power");
#ifdef _MODULE
#include "ioconf.c"
Index: src/sys/dev/acpi/acpi_tz.c
diff -u src/sys/dev/acpi/acpi_tz.c:1.87 src/sys/dev/acpi/acpi_tz.c:1.88
--- src/sys/dev/acpi/acpi_tz.c:1.87 Sun Jul 29 02:58:27 2012
+++ src/sys/dev/acpi/acpi_tz.c Thu Apr 23 23:23:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_tz.c,v 1.87 2012/07/29 02:58:27 pgoyette Exp $ */
+/* $NetBSD: acpi_tz.c,v 1.88 2015/04/23 23:23:00 pgoyette Exp $ */
/*
* Copyright (c) 2003 Jared D. McNeill <jmcne...@invisible.ca>
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_tz.c,v 1.87 2012/07/29 02:58:27 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_tz.c,v 1.88 2015/04/23 23:23:00 pgoyette Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -864,7 +864,7 @@ acpitz_get_limits(struct sysmon_envsys *
}
}
-MODULE(MODULE_CLASS_DRIVER, acpitz, NULL);
+MODULE(MODULE_CLASS_DRIVER, acpitz, "sysmon_envsys");
#ifdef _MODULE
#include "ioconf.c"
Index: src/sys/dev/acpi/acpi_wdrt.c
diff -u src/sys/dev/acpi/acpi_wdrt.c:1.3 src/sys/dev/acpi/acpi_wdrt.c:1.4
--- src/sys/dev/acpi/acpi_wdrt.c:1.3 Fri Dec 27 18:52:16 2013
+++ src/sys/dev/acpi/acpi_wdrt.c Thu Apr 23 23:23:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_wdrt.c,v 1.3 2013/12/27 18:52:16 christos Exp $ */
+/* $NetBSD: acpi_wdrt.c,v 1.4 2015/04/23 23:23:00 pgoyette Exp $ */
/*
* Copyright (c) 2011 Jared D. McNeill <jmcne...@invisible.ca>
@@ -35,7 +35,7 @@
/* #define ACPIWDRT_DEBUG */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_wdrt.c,v 1.3 2013/12/27 18:52:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_wdrt.c,v 1.4 2015/04/23 23:23:00 pgoyette Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -408,7 +408,7 @@ acpi_wdrt_write_count(struct acpi_wdrt_s
return rv;
}
-MODULE(MODULE_CLASS_DRIVER, acpiwdrt, NULL);
+MODULE(MODULE_CLASS_DRIVER, acpiwdrt, "sysmon_wdog");
#ifdef _MODULE
#include "ioconf.c"
Index: src/sys/dev/acpi/fujhk_acpi.c
diff -u src/sys/dev/acpi/fujhk_acpi.c:1.3 src/sys/dev/acpi/fujhk_acpi.c:1.4
--- src/sys/dev/acpi/fujhk_acpi.c:1.3 Tue Feb 25 18:30:09 2014
+++ src/sys/dev/acpi/fujhk_acpi.c Thu Apr 23 23:23:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: fujhk_acpi.c,v 1.3 2014/02/25 18:30:09 pooka Exp $ */
+/* $NetBSD: fujhk_acpi.c,v 1.4 2015/04/23 23:23:00 pgoyette Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fujhk_acpi.c,v 1.3 2014/02/25 18:30:09 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fujhk_acpi.c,v 1.4 2015/04/23 23:23:00 pgoyette Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -515,7 +515,7 @@ fujitsu_hk_eval_nary_integer(ACPI_HANDLE
return AE_OK;
}
-MODULE(MODULE_CLASS_DRIVER, fujhk, NULL);
+MODULE(MODULE_CLASS_DRIVER, fujhk, "sysmon_power");
#ifdef _MODULE
#include "ioconf.c"
Index: src/sys/dev/acpi/aibs_acpi.c
diff -u src/sys/dev/acpi/aibs_acpi.c:1.4 src/sys/dev/acpi/aibs_acpi.c:1.5
--- src/sys/dev/acpi/aibs_acpi.c:1.4 Tue Aug 14 14:36:43 2012
+++ src/sys/dev/acpi/aibs_acpi.c Thu Apr 23 23:23:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: aibs_acpi.c,v 1.4 2012/08/14 14:36:43 jruoho Exp $ */
+/* $NetBSD: aibs_acpi.c,v 1.5 2015/04/23 23:23:00 pgoyette Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aibs_acpi.c,v 1.4 2012/08/14 14:36:43 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aibs_acpi.c,v 1.5 2015/04/23 23:23:00 pgoyette Exp $");
#include <sys/param.h>
#include <sys/kmem.h>
@@ -743,7 +743,7 @@ aibs_sensor_limits(struct sysmon_envsys
}
}
-MODULE(MODULE_CLASS_DRIVER, aibs, NULL);
+MODULE(MODULE_CLASS_DRIVER, aibs, "sysmon_envsys");
#ifdef _MODULE
#include "ioconf.c"
Index: src/sys/dev/acpi/hpacel_acpi.c
diff -u src/sys/dev/acpi/hpacel_acpi.c:1.4 src/sys/dev/acpi/hpacel_acpi.c:1.5
--- src/sys/dev/acpi/hpacel_acpi.c:1.4 Tue Aug 14 14:36:43 2012
+++ src/sys/dev/acpi/hpacel_acpi.c Thu Apr 23 23:23:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: hpacel_acpi.c,v 1.4 2012/08/14 14:36:43 jruoho Exp $ */
+/* $NetBSD: hpacel_acpi.c,v 1.5 2015/04/23 23:23:00 pgoyette Exp $ */
/*-
* Copyright (c) 2009, 2011 Jukka Ruohonen <jruoho...@iki.fi>
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpacel_acpi.c,v 1.4 2012/08/14 14:36:43 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpacel_acpi.c,v 1.5 2015/04/23 23:23:00 pgoyette Exp $");
#include <sys/param.h>
#include <sys/module.h>
@@ -574,7 +574,7 @@ hpacel_sensor_refresh(struct sysmon_envs
}
}
-MODULE(MODULE_CLASS_DRIVER, hpacel, NULL);
+MODULE(MODULE_CLASS_DRIVER, hpacel, "sysmon_envsys");
#ifdef _MODULE
#include "ioconf.c"
Index: src/sys/dev/acpi/asus_acpi.c
diff -u src/sys/dev/acpi/asus_acpi.c:1.25 src/sys/dev/acpi/asus_acpi.c:1.26
--- src/sys/dev/acpi/asus_acpi.c:1.25 Tue Feb 25 18:30:09 2014
+++ src/sys/dev/acpi/asus_acpi.c Thu Apr 23 23:23:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: asus_acpi.c,v 1.25 2014/02/25 18:30:09 pooka Exp $ */
+/* $NetBSD: asus_acpi.c,v 1.26 2015/04/23 23:23:00 pgoyette Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: asus_acpi.c,v 1.25 2014/02/25 18:30:09 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: asus_acpi.c,v 1.26 2015/04/23 23:23:00 pgoyette Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -409,7 +409,7 @@ asus_get_fan_speed(struct asus_softc *sc
return true;
}
-MODULE(MODULE_CLASS_DRIVER, asus, NULL);
+MODULE(MODULE_CLASS_DRIVER, asus, "sysmon_envsys,sysmon_power");
#ifdef _MODULE
#include "ioconf.c"
Index: src/sys/dev/acpi/dalb_acpi.c
diff -u src/sys/dev/acpi/dalb_acpi.c:1.17 src/sys/dev/acpi/dalb_acpi.c:1.18
--- src/sys/dev/acpi/dalb_acpi.c:1.17 Wed Feb 16 09:05:12 2011
+++ src/sys/dev/acpi/dalb_acpi.c Thu Apr 23 23:23:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: dalb_acpi.c,v 1.17 2011/02/16 09:05:12 jruoho Exp $ */
+/* $NetBSD: dalb_acpi.c,v 1.18 2015/04/23 23:23:00 pgoyette Exp $ */
/*-
* Copyright (c) 2008 Christoph Egger <ceg...@netbsd.org>
@@ -27,7 +27,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dalb_acpi.c,v 1.17 2011/02/16 09:05:12 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dalb_acpi.c,v 1.18 2015/04/23 23:23:00 pgoyette Exp $");
/*
* Direct Application Launch Button:
@@ -261,7 +261,7 @@ acpi_dalb_resume(device_t dev, const pmf
return true;
}
-MODULE(MODULE_CLASS_DRIVER, acpidalb, NULL);
+MODULE(MODULE_CLASS_DRIVER, acpidalb, "sysmon_power");
#ifdef _MODULE
#include "ioconf.c"
Index: src/sys/dev/acpi/hpqlb_acpi.c
diff -u src/sys/dev/acpi/hpqlb_acpi.c:1.9 src/sys/dev/acpi/hpqlb_acpi.c:1.10
--- src/sys/dev/acpi/hpqlb_acpi.c:1.9 Wed Feb 16 09:05:12 2011
+++ src/sys/dev/acpi/hpqlb_acpi.c Thu Apr 23 23:23:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: hpqlb_acpi.c,v 1.9 2011/02/16 09:05:12 jruoho Exp $ */
+/* $NetBSD: hpqlb_acpi.c,v 1.10 2015/04/23 23:23:00 pgoyette Exp $ */
/*-
* Copyright (c) 2008 Christoph Egger <ceg...@netbsd.org>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpqlb_acpi.c,v 1.9 2011/02/16 09:05:12 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpqlb_acpi.c,v 1.10 2015/04/23 23:23:00 pgoyette Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -303,7 +303,7 @@ hpqlb_resume(device_t self, const pmf_qu
return true;
}
-MODULE(MODULE_CLASS_DRIVER, hpqlb, NULL);
+MODULE(MODULE_CLASS_DRIVER, hpqlb, "sysmon_power");
#ifdef _MODULE
#include "ioconf.c"
Index: src/sys/dev/acpi/thinkpad_acpi.c
diff -u src/sys/dev/acpi/thinkpad_acpi.c:1.44 src/sys/dev/acpi/thinkpad_acpi.c:1.45
--- src/sys/dev/acpi/thinkpad_acpi.c:1.44 Sat Mar 30 19:05:20 2013
+++ src/sys/dev/acpi/thinkpad_acpi.c Thu Apr 23 23:23:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: thinkpad_acpi.c,v 1.44 2013/03/30 19:05:20 christos Exp $ */
+/* $NetBSD: thinkpad_acpi.c,v 1.45 2015/04/23 23:23:00 pgoyette Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: thinkpad_acpi.c,v 1.44 2013/03/30 19:05:20 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: thinkpad_acpi.c,v 1.45 2015/04/23 23:23:00 pgoyette Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -769,7 +769,7 @@ thinkpad_resume(device_t dv, const pmf_q
return true;
}
-MODULE(MODULE_CLASS_DRIVER, thinkpad, NULL);
+MODULE(MODULE_CLASS_DRIVER, thinkpad, "sysmon_envsys,sysmon_power");
#ifdef _MODULE
#include "ioconf.c"
Index: src/sys/dev/acpi/wmi/wmi_dell.c
diff -u src/sys/dev/acpi/wmi/wmi_dell.c:1.8 src/sys/dev/acpi/wmi/wmi_dell.c:1.9
--- src/sys/dev/acpi/wmi/wmi_dell.c:1.8 Wed Feb 16 13:15:49 2011
+++ src/sys/dev/acpi/wmi/wmi_dell.c Thu Apr 23 23:23:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: wmi_dell.c,v 1.8 2011/02/16 13:15:49 jruoho Exp $ */
+/* $NetBSD: wmi_dell.c,v 1.9 2015/04/23 23:23:00 pgoyette Exp $ */
/*-
* Copyright (c) 2009, 2010 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wmi_dell.c,v 1.8 2011/02/16 13:15:49 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wmi_dell.c,v 1.9 2015/04/23 23:23:00 pgoyette Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -233,7 +233,7 @@ out:
"event 0x%02X: %s\n", evt, AcpiFormatException(rv));
}
-MODULE(MODULE_CLASS_DRIVER, wmidell, "acpiwmi");
+MODULE(MODULE_CLASS_DRIVER, wmidell, "acpiwmi,sysmon_power");
#ifdef _MODULE
#include "ioconf.c"
Index: src/sys/dev/acpi/wmi/wmi_hp.c
diff -u src/sys/dev/acpi/wmi/wmi_hp.c:1.8 src/sys/dev/acpi/wmi/wmi_hp.c:1.9
--- src/sys/dev/acpi/wmi/wmi_hp.c:1.8 Tue Feb 25 18:30:09 2014
+++ src/sys/dev/acpi/wmi/wmi_hp.c Thu Apr 23 23:23:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: wmi_hp.c,v 1.8 2014/02/25 18:30:09 pooka Exp $ */
+/* $NetBSD: wmi_hp.c,v 1.9 2015/04/23 23:23:00 pgoyette Exp $ */
/*-
* Copyright (c) 2009, 2010 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wmi_hp.c,v 1.8 2014/02/25 18:30:09 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wmi_hp.c,v 1.9 2015/04/23 23:23:00 pgoyette Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -677,7 +677,7 @@ wmi_hp_sensor_refresh(struct sysmon_envs
WMI_HP_METHOD_CMD_DOCK);
}
-MODULE(MODULE_CLASS_DRIVER, wmihp, "acpiwmi");
+MODULE(MODULE_CLASS_DRIVER, wmihp, "acpiwmi,sysmon_envsys");
#ifdef _MODULE
#include "ioconf.c"
Index: src/sys/dev/acpi/wmi/wmi_eeepc.c
diff -u src/sys/dev/acpi/wmi/wmi_eeepc.c:1.3 src/sys/dev/acpi/wmi/wmi_eeepc.c:1.4
--- src/sys/dev/acpi/wmi/wmi_eeepc.c:1.3 Fri Jul 22 15:53:02 2011
+++ src/sys/dev/acpi/wmi/wmi_eeepc.c Thu Apr 23 23:23:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: wmi_eeepc.c,v 1.3 2011/07/22 15:53:02 jakllsch Exp $ */
+/* $NetBSD: wmi_eeepc.c,v 1.4 2015/04/23 23:23:00 pgoyette Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wmi_eeepc.c,v 1.3 2011/07/22 15:53:02 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wmi_eeepc.c,v 1.4 2015/04/23 23:23:00 pgoyette Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -333,7 +333,7 @@ out:
"event 0x%02X: %s\n", evt, AcpiFormatException(rv));
}
-MODULE(MODULE_CLASS_DRIVER, wmieeepc, "acpiwmi");
+MODULE(MODULE_CLASS_DRIVER, wmieeepc, "acpiwmi,sysmon_power");
#ifdef _MODULE
#include "ioconf.c"
Index: src/sys/dev/i2c/dbcool.c
diff -u src/sys/dev/i2c/dbcool.c:1.42 src/sys/dev/i2c/dbcool.c:1.43
--- src/sys/dev/i2c/dbcool.c:1.42 Sat Mar 7 14:16:51 2015
+++ src/sys/dev/i2c/dbcool.c Thu Apr 23 23:23:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: dbcool.c,v 1.42 2015/03/07 14:16:51 jmcneill Exp $ */
+/* $NetBSD: dbcool.c,v 1.43 2015/04/23 23:23:00 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dbcool.c,v 1.42 2015/03/07 14:16:51 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dbcool.c,v 1.43 2015/04/23 23:23:00 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -2161,7 +2161,7 @@ dbcool_set_fan_limits(struct dbcool_soft
}
}
-MODULE(MODULE_CLASS_DRIVER, dbcool, "i2cexec");
+MODULE(MODULE_CLASS_DRIVER, dbcool, "i2cexec,sysmon_envsys");
#ifdef _MODULE
#include "ioconf.c"
Index: src/sys/dev/i2c/hytp14.c
diff -u src/sys/dev/i2c/hytp14.c:1.3 src/sys/dev/i2c/hytp14.c:1.4
--- src/sys/dev/i2c/hytp14.c:1.3 Sat Mar 7 14:16:51 2015
+++ src/sys/dev/i2c/hytp14.c Thu Apr 23 23:23:00 2015
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hytp14.c,v 1.3 2015/03/07 14:16:51 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hytp14.c,v 1.4 2015/04/23 23:23:00 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -283,7 +283,7 @@ hytp14_refresh(struct sysmon_envsys *sme
}
-MODULE(MODULE_CLASS_DRIVER, hythygtemp, "i2cexec");
+MODULE(MODULE_CLASS_DRIVER, hythygtemp, "i2cexec,sysmon_envsys");
#ifdef _MODULE
#include "ioconf.c"
Index: src/sys/dev/i2c/sdtemp.c
diff -u src/sys/dev/i2c/sdtemp.c:1.24 src/sys/dev/i2c/sdtemp.c:1.25
--- src/sys/dev/i2c/sdtemp.c:1.24 Sat Mar 7 14:16:51 2015
+++ src/sys/dev/i2c/sdtemp.c Thu Apr 23 23:23:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sdtemp.c,v 1.24 2015/03/07 14:16:51 jmcneill Exp $ */
+/* $NetBSD: sdtemp.c,v 1.25 2015/04/23 23:23:00 pgoyette Exp $ */
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdtemp.c,v 1.24 2015/03/07 14:16:51 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdtemp.c,v 1.25 2015/04/23 23:23:00 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -553,7 +553,7 @@ sdtemp_pmf_resume(device_t dev, const pm
return (error == 0);
}
-MODULE(MODULE_CLASS_DRIVER, sdtemp, "i2cexec");
+MODULE(MODULE_CLASS_DRIVER, sdtemp, "i2cexec,sysmon_envsys");
#ifdef _MODULE
#include "ioconf.c"
Index: src/sys/dev/ic/apple_smc_fan.c
diff -u src/sys/dev/ic/apple_smc_fan.c:1.4 src/sys/dev/ic/apple_smc_fan.c:1.5
--- src/sys/dev/ic/apple_smc_fan.c:1.4 Tue Apr 1 17:49:05 2014
+++ src/sys/dev/ic/apple_smc_fan.c Thu Apr 23 23:23:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: apple_smc_fan.c,v 1.4 2014/04/01 17:49:05 riastradh Exp $ */
+/* $NetBSD: apple_smc_fan.c,v 1.5 2015/04/23 23:23:00 pgoyette Exp $ */
/*
* Apple System Management Controller: Fans
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: apple_smc_fan.c,v 1.4 2014/04/01 17:49:05 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: apple_smc_fan.c,v 1.5 2015/04/23 23:23:00 pgoyette Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -448,7 +448,7 @@ apple_smc_fan_sysctl_setup_1(struct appl
}
#endif
-MODULE(MODULE_CLASS_DRIVER, apple_smc_fan, "apple_smc");
+MODULE(MODULE_CLASS_DRIVER, apple_smc_fan, "apple_smc,sysmon_envsys");
#ifdef _MODULE
#include "ioconf.c"
Index: src/sys/dev/ic/apple_smc_temp.c
diff -u src/sys/dev/ic/apple_smc_temp.c:1.4 src/sys/dev/ic/apple_smc_temp.c:1.5
--- src/sys/dev/ic/apple_smc_temp.c:1.4 Tue Apr 1 17:49:05 2014
+++ src/sys/dev/ic/apple_smc_temp.c Thu Apr 23 23:23:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: apple_smc_temp.c,v 1.4 2014/04/01 17:49:05 riastradh Exp $ */
+/* $NetBSD: apple_smc_temp.c,v 1.5 2015/04/23 23:23:00 pgoyette Exp $ */
/*
* Apple System Management Controller: Temperature Sensors
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: apple_smc_temp.c,v 1.4 2014/04/01 17:49:05 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: apple_smc_temp.c,v 1.5 2015/04/23 23:23:00 pgoyette Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -443,7 +443,7 @@ apple_smc_bound_temp_sensors(struct appl
return 0;
}
-MODULE(MODULE_CLASS_DRIVER, apple_smc_temp, "apple_smc");
+MODULE(MODULE_CLASS_DRIVER, apple_smc_temp, "apple_smc,sysmon_envsys");
#ifdef _MODULE
#include "ioconf.c"
Index: src/sys/dev/ic/nslm7x.c
diff -u src/sys/dev/ic/nslm7x.c:1.61 src/sys/dev/ic/nslm7x.c:1.62
--- src/sys/dev/ic/nslm7x.c:1.61 Sun Nov 16 16:20:00 2014
+++ src/sys/dev/ic/nslm7x.c Thu Apr 23 23:23:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: nslm7x.c,v 1.61 2014/11/16 16:20:00 ozaki-r Exp $ */
+/* $NetBSD: nslm7x.c,v 1.62 2015/04/23 23:23:00 pgoyette Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nslm7x.c,v 1.61 2014/11/16 16:20:00 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nslm7x.c,v 1.62 2015/04/23 23:23:00 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -2262,7 +2262,7 @@ as_refresh_temp(struct lm_softc *sc, int
__func__, n, data, sc->sensors[n].value_cur));
}
-MODULE(MODULE_CLASS_DRIVER, lm, NULL);
+MODULE(MODULE_CLASS_DRIVER, lm, "sysmon_envsys");
static int
lm_modcmd(modcmd_t cmd, void *opaque)
Index: src/sys/dev/isa/aps.c
diff -u src/sys/dev/isa/aps.c:1.16 src/sys/dev/isa/aps.c:1.17
--- src/sys/dev/isa/aps.c:1.16 Sun Nov 16 16:20:00 2014
+++ src/sys/dev/isa/aps.c Thu Apr 23 23:23:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: aps.c,v 1.16 2014/11/16 16:20:00 ozaki-r Exp $ */
+/* $NetBSD: aps.c,v 1.17 2015/04/23 23:23:00 pgoyette Exp $ */
/* $OpenBSD: aps.c,v 1.15 2007/05/19 19:14:11 tedu Exp $ */
/* $OpenBSD: aps.c,v 1.17 2008/06/27 06:08:43 canacar Exp $ */
/*
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aps.c,v 1.16 2014/11/16 16:20:00 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aps.c,v 1.17 2015/04/23 23:23:00 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -547,7 +547,7 @@ aps_resume(device_t dv, const pmf_qual_t
return true;
}
-MODULE(MODULE_CLASS_DRIVER, aps, NULL);
+MODULE(MODULE_CLASS_DRIVER, aps, "sysmon_envsys");
#ifdef _MODULE
#include "ioconf.c"
Index: src/sys/dev/isa/finsio_isa.c
diff -u src/sys/dev/isa/finsio_isa.c:1.7 src/sys/dev/isa/finsio_isa.c:1.8
--- src/sys/dev/isa/finsio_isa.c:1.7 Sun Jul 31 18:23:46 2011
+++ src/sys/dev/isa/finsio_isa.c Thu Apr 23 23:23:00 2015
@@ -1,5 +1,5 @@
/* $OpenBSD: fins.c,v 1.1 2008/03/19 19:33:09 deraadt Exp $ */
-/* $NetBSD: finsio_isa.c,v 1.7 2011/07/31 18:23:46 jakllsch Exp $ */
+/* $NetBSD: finsio_isa.c,v 1.8 2015/04/23 23:23:00 pgoyette Exp $ */
/*
* Copyright (c) 2008 Juan Romero Pardines
@@ -19,7 +19,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: finsio_isa.c,v 1.7 2011/07/31 18:23:46 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: finsio_isa.c,v 1.8 2015/04/23 23:23:00 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -689,7 +689,7 @@ finsio_refresh_fanrpm(struct finsio_soft
}
}
-MODULE(MODULE_CLASS_DRIVER, finsio, NULL);
+MODULE(MODULE_CLASS_DRIVER, finsio, "sysmon_envsys");
#ifdef _MODULE
#include "ioconf.c"
Index: src/sys/dev/isa/itesio_isa.c
diff -u src/sys/dev/isa/itesio_isa.c:1.24 src/sys/dev/isa/itesio_isa.c:1.25
--- src/sys/dev/isa/itesio_isa.c:1.24 Thu Nov 15 04:45:01 2012
+++ src/sys/dev/isa/itesio_isa.c Thu Apr 23 23:23:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: itesio_isa.c,v 1.24 2012/11/15 04:45:01 msaitoh Exp $ */
+/* $NetBSD: itesio_isa.c,v 1.25 2015/04/23 23:23:00 pgoyette Exp $ */
/* Derived from $OpenBSD: it.c,v 1.19 2006/04/10 00:57:54 deraadt Exp $ */
/*
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: itesio_isa.c,v 1.24 2012/11/15 04:45:01 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: itesio_isa.c,v 1.25 2015/04/23 23:23:00 pgoyette Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -612,7 +612,7 @@ itesio_wdt_tickle(struct sysmon_wdog *sm
return 0;
}
-MODULE(MODULE_CLASS_DRIVER, itesio, NULL);
+MODULE(MODULE_CLASS_DRIVER, itesio, "sysmon_envsys,sysmon_wdog");
#ifdef _MODULE
#include "ioconf.c"
Index: src/sys/dev/isa/nsclpcsio_isa.c
diff -u src/sys/dev/isa/nsclpcsio_isa.c:1.30 src/sys/dev/isa/nsclpcsio_isa.c:1.31
--- src/sys/dev/isa/nsclpcsio_isa.c:1.30 Fri Jul 15 20:56:26 2011
+++ src/sys/dev/isa/nsclpcsio_isa.c Thu Apr 23 23:23:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: nsclpcsio_isa.c,v 1.30 2011/07/15 20:56:26 jmcneill Exp $ */
+/* $NetBSD: nsclpcsio_isa.c,v 1.31 2015/04/23 23:23:00 pgoyette Exp $ */
/*
* Copyright (c) 2002
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nsclpcsio_isa.c,v 1.30 2011/07/15 20:56:26 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nsclpcsio_isa.c,v 1.31 2015/04/23 23:23:00 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -675,7 +675,7 @@ nsclpcsio_gpio_pin_ctl(void *aux, int pi
}
#endif /* NGPIO */
-MODULE(MODULE_CLASS_DRIVER, nsclpcsio, NULL);
+MODULE(MODULE_CLASS_DRIVER, nsclpcsio, "sysmon_envsys");
#ifdef _MODULE
#include "ioconf.c"
Index: src/sys/dev/isa/smsc.c
diff -u src/sys/dev/isa/smsc.c:1.11 src/sys/dev/isa/smsc.c:1.12
--- src/sys/dev/isa/smsc.c:1.11 Sun Jul 31 16:18:54 2011
+++ src/sys/dev/isa/smsc.c Thu Apr 23 23:23:00 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: smsc.c,v 1.11 2011/07/31 16:18:54 jmcneill Exp $ */
+/* $NetBSD: smsc.c,v 1.12 2015/04/23 23:23:00 pgoyette Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smsc.c,v 1.11 2011/07/31 16:18:54 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smsc.c,v 1.12 2015/04/23 23:23:00 pgoyette Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -343,7 +343,7 @@ smsc_refresh(struct sysmon_envsys *sme,
}
}
-MODULE(MODULE_CLASS_DRIVER, smsc, NULL);
+MODULE(MODULE_CLASS_DRIVER, smsc, "sysmon_envsys");
#ifdef _MODULE
#include "ioconf.c"
Index: src/sys/dev/pci/pwdog.c
diff -u src/sys/dev/pci/pwdog.c:1.7 src/sys/dev/pci/pwdog.c:1.8
--- src/sys/dev/pci/pwdog.c:1.7 Tue Aug 30 07:22:12 2011
+++ src/sys/dev/pci/pwdog.c Thu Apr 23 23:23:01 2015
@@ -1,4 +1,4 @@
-/* $$NetBSD: pwdog.c,v 1.7 2011/08/30 07:22:12 mbalmer Exp $ */
+/* $$NetBSD: pwdog.c,v 1.8 2015/04/23 23:23:01 pgoyette Exp $ */
/* $OpenBSD: pwdog.c,v 1.7 2010/04/08 00:23:53 tedu Exp $ */
/*
@@ -191,7 +191,7 @@ pwdog_tickle(struct sysmon_wdog *smw)
return 0;
}
-MODULE(MODULE_CLASS_DRIVER, pwdog, "pci");
+MODULE(MODULE_CLASS_DRIVER, pwdog, "pci,sysmon_wdog");
#ifdef _MODULE
#include "ioconf.c"
Index: src/sys/dev/sysmon/swsensor.c
diff -u src/sys/dev/sysmon/swsensor.c:1.13 src/sys/dev/sysmon/swsensor.c:1.14
--- src/sys/dev/sysmon/swsensor.c:1.13 Mon Aug 27 20:29:11 2012
+++ src/sys/dev/sysmon/swsensor.c Thu Apr 23 23:23:01 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: swsensor.c,v 1.13 2012/08/27 20:29:11 pgoyette Exp $ */
+/* $NetBSD: swsensor.c,v 1.14 2015/04/23 23:23:01 pgoyette Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: swsensor.c,v 1.13 2012/08/27 20:29:11 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: swsensor.c,v 1.14 2015/04/23 23:23:01 pgoyette Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -60,7 +60,7 @@ static int32_t sw_sensor_mode;
static int32_t sw_sensor_defprops;
sysmon_envsys_lim_t sw_sensor_deflims;
-MODULE(MODULE_CLASS_DRIVER, swsensor, NULL);
+MODULE(MODULE_CLASS_DRIVER, swsensor, "sysmon_envsys");
/*
* Set-up the sysctl interface for setting the sensor's cur_value
@@ -225,6 +225,7 @@ swsensor_init(void *arg)
val = prop_number_integer_value(po);
/* Sensor type/units */
+printf("%s: prop object key = \"%s\"\n", __func__, key);
if (strcmp(key, "type") == 0) {
if (type == PROP_TYPE_NUMBER) {
descr = sme_find_table_entry(
Index: src/sys/dev/sysmon/swwdog.c
diff -u src/sys/dev/sysmon/swwdog.c:1.15 src/sys/dev/sysmon/swwdog.c:1.16
--- src/sys/dev/sysmon/swwdog.c:1.15 Sat Apr 18 22:56:52 2015
+++ src/sys/dev/sysmon/swwdog.c Thu Apr 23 23:23:01 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: swwdog.c,v 1.15 2015/04/18 22:56:52 pgoyette Exp $ */
+/* $NetBSD: swwdog.c,v 1.16 2015/04/23 23:23:01 pgoyette Exp $ */
/*
* Copyright (c) 2004, 2005 Steven M. Bellovin
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: swwdog.c,v 1.15 2015/04/18 22:56:52 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: swwdog.c,v 1.16 2015/04/23 23:23:01 pgoyette Exp $");
/*
*
@@ -69,11 +69,9 @@ bool swwdog_reboot = false; /* false -->
static struct workqueue *wq;
static device_t swwdog_dev;
-MODULE(MODULE_CLASS_DRIVER, swwdog, NULL);
+MODULE(MODULE_CLASS_DRIVER, swwdog, "sysmon_wdog");
-#ifdef _LKM
CFDRIVER_DECL(swwdog, DV_DULL, NULL);
-#endif
int swwdogattach(int);
@@ -305,7 +303,6 @@ static
int
swwdog_init(void *arg)
{
-#ifdef _LKM
/*
* Merge the driver info into the kernel tables and attach the
* pseudo-device
@@ -325,10 +322,6 @@ swwdog_init(void *arg)
}
return error;
-#else
-
- return 0;
-#endif
}
static
@@ -344,12 +337,10 @@ swwdog_fini(void *arg)
aprint_error("%s: error detaching cfattach: %d\n",
swwdog_cd.cd_name, error);
-#ifdef _LKM
error = config_cfdriver_detach(&swwdog_cd);
if (error)
aprint_error("%s: error detaching cfdriver: %d\n",
swwdog_cd.cd_name, error);
-#endif
return error;
}
