Module Name: src
Committed By: pooka
Date: Sat Jan 30 21:55:31 UTC 2010
Modified Files:
src/share/man/man4: swwdog.4
src/sys/dev/sysmon: files.sysmon swwdog.c
Log Message:
Make swwdog use no-needs-count. As the manpage says, there can be only one.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/share/man/man4/swwdog.4
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/sysmon/files.sysmon
cvs rdiff -u -r1.7 -r1.8 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/share/man/man4/swwdog.4
diff -u src/share/man/man4/swwdog.4:1.3 src/share/man/man4/swwdog.4:1.4
--- src/share/man/man4/swwdog.4:1.3 Wed Jan 12 15:16:33 2005
+++ src/share/man/man4/swwdog.4 Sat Jan 30 21:55:28 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: swwdog.4,v 1.3 2005/01/12 15:16:33 drochner Exp $
+.\" $NetBSD: swwdog.4,v 1.4 2010/01/30 21:55:28 pooka Exp $
.\"
.\" Copyright (c) 2004, 2005 Steven M. Bellovin
.\" All rights reserved.
@@ -31,7 +31,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd January 6, 2005
+.Dd January 30, 2010
.\" Written by Steven M. Bellovin
.Dt SWWDOG 4
.Os
@@ -39,7 +39,7 @@
.Nm swwdog
.Nd software watchdog timer
.Sh SYNOPSIS
-.Cd "pseudo-device swwdog" Op Ar count
+.Cd "pseudo-device swwdog"
.Sh DESCRIPTION
The
.Nm
@@ -60,10 +60,7 @@
driver was written by
.An Steven M. Bellovin .
.Sh BUGS
-Although more than one
-.Nm
-timer can be configured, it's a pointless thing to do, since only
-one watchdog timer can be active at any given time.
+Only one watchdog timer can be active at any given time.
Arguably, this is a bug in the watchdog timer framework.
.Pp
Kernel tickle mode is useless with
Index: src/sys/dev/sysmon/files.sysmon
diff -u src/sys/dev/sysmon/files.sysmon:1.10 src/sys/dev/sysmon/files.sysmon:1.11
--- src/sys/dev/sysmon/files.sysmon:1.10 Tue Sep 4 16:54:02 2007
+++ src/sys/dev/sysmon/files.sysmon Sat Jan 30 21:55:28 2010
@@ -1,4 +1,4 @@
-# $NetBSD: files.sysmon,v 1.10 2007/09/04 16:54:02 xtraeme Exp $
+# $NetBSD: files.sysmon,v 1.11 2010/01/30 21:55:28 pooka Exp $
define sysmon_taskq
file dev/sysmon/sysmon_taskq.c sysmon_taskq needs-flag
@@ -19,5 +19,4 @@
sysmon_power
defpseudo swwdog: sysmon_wdog
-file dev/sysmon/swwdog.c swwdog needs-count
-
+file dev/sysmon/swwdog.c swwdog
Index: src/sys/dev/sysmon/swwdog.c
diff -u src/sys/dev/sysmon/swwdog.c:1.7 src/sys/dev/sysmon/swwdog.c:1.8
--- src/sys/dev/sysmon/swwdog.c:1.7 Mon Jul 9 21:01:23 2007
+++ src/sys/dev/sysmon/swwdog.c Sat Jan 30 21:55:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: swwdog.c,v 1.7 2007/07/09 21:01:23 ad Exp $ */
+/* $NetBSD: swwdog.c,v 1.8 2010/01/30 21:55:30 pooka Exp $ */
/*
* Copyright (c) 2004, 2005 Steven M. Bellovin
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: swwdog.c,v 1.7 2007/07/09 21:01:23 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: swwdog.c,v 1.8 2010/01/30 21:55:30 pooka Exp $");
/*
*
@@ -49,8 +49,7 @@
#include <sys/wdog.h>
#include <dev/sysmon/sysmonvar.h>
-#include "swwdog.h"
-
+#define NSWWDOG 1
struct swwdog_softc {
struct sysmon_wdog sc_smw;
struct callout sc_c;
